- Wine-Commits - list.winehq.org

Alexandre Julliard : wow64: Push a valid return address when calling KiRaiseUserExceptionDispatcher.
by Alexandre Julliard March 7, 2023

March 7, 2023

Module: wine Branch: master Commit: 96841d0358fe35c448fce4ad494a1db98f3f2e7a URL: https://gitlab.winehq.org/wine/wine/-/commit/96841d0358fe35c448fce4ad494a1d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 7 17:21:40 2023 +0100 wow64: Push a valid return address when calling KiRaiseUserExceptionDispatcher. --- dlls/wow64/syscall.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/wow64/syscall.c b/dlls/wow64/syscall.c index 1feeac083d9..de5a42aec4f 100644 --- a/dlls/wow64/syscall.c +++ b/dlls/wow64/syscall.c @@ -278,6 +278,8 @@ static void call_raise_user_exception_dispatcher( ULONG code ) I386_CONTEXT ctx = { CONTEXT_I386_ALL }; pBTCpuGetContext( GetCurrentThread(), GetCurrentProcess(), NULL, &ctx ); + ctx.Esp -= sizeof(ULONG); + *(ULONG *)ULongToPtr( ctx.Esp ) = ctx.Eip; ctx.Eip = (ULONG_PTR)pKiRaiseUserExceptionDispatcher; pBTCpuSetContext( GetCurrentThread(), GetCurrentProcess(), NULL, &ctx ); }

1 0

Alexandre Julliard : wow64: Keep track of APC stack frames, similarly to user callback frames.
by Alexandre Julliard March 7, 2023

March 7, 2023

Module: wine Branch: master Commit: c244fe3d2749696b8c335c1b65b9d8291f7f0e6a URL: https://gitlab.winehq.org/wine/wine/-/commit/c244fe3d2749696b8c335c1b65b9d8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 7 17:22:46 2023 +0100 wow64: Keep track of APC stack frames, similarly to user callback frames. And use the appropriate frame to restore the context in NtContinue. --- dlls/wow64/syscall.c | 31 ++++++++++++++++++++++--------- include/winternl.h | 1 + 2 files changed, 23 insertions(+), 9 deletions(-) diff --git a/dlls/wow64/syscall.c b/dlls/wow64/syscall.c index de5a42aec4f..d2bb054b6d0 100644 --- a/dlls/wow64/syscall.c +++ b/dlls/wow64/syscall.c @@ -84,6 +84,13 @@ struct user_callback_frame __wine_jmp_buf jmpbuf; }; +/* stack frame for user APCs */ +struct user_apc_frame +{ + struct user_apc_frame *prev_frame; + CONTEXT *context; + void *wow_context; +}; SYSTEM_DLL_INIT_BLOCK *pLdrSystemDllInitBlock = NULL; @@ -416,8 +423,14 @@ NTSTATUS WINAPI wow64_NtContinue( UINT *args ) BOOLEAN alertable = get_ulong( &args ); NTSTATUS status = get_context_return_value( context ); + struct user_apc_frame *frame = NtCurrentTeb()->TlsSlots[WOW64_TLS_APCLIST]; pBTCpuSetContext( GetCurrentThread(), GetCurrentProcess(), NULL, context ); + + while (frame && frame->wow_context != context) frame = frame->prev_frame; + NtCurrentTeb()->TlsSlots[WOW64_TLS_APCLIST] = frame ? frame->prev_frame : NULL; + if (frame) NtContinue( frame->context, alertable ); + if (alertable) NtTestAlert(); return status; } @@ -981,13 +994,11 @@ void * WINAPI Wow64AllocateTemp( SIZE_T size ) */ void WINAPI Wow64ApcRoutine( ULONG_PTR arg1, ULONG_PTR arg2, ULONG_PTR arg3, CONTEXT *context ) { - NTSTATUS retval; + struct user_apc_frame frame; -#ifdef __x86_64__ - retval = context->Rax; -#elif defined(__aarch64__) - retval = context->X0; -#endif + frame.prev_frame = NtCurrentTeb()->TlsSlots[WOW64_TLS_APCLIST]; + frame.context = context; + NtCurrentTeb()->TlsSlots[WOW64_TLS_APCLIST] = &frame; /* cf. 32-bit call_user_apc_dispatcher */ switch (current_machine) @@ -1014,10 +1025,11 @@ void WINAPI Wow64ApcRoutine( ULONG_PTR arg1, ULONG_PTR arg2, ULONG_PTR arg3, CON stack->arg2 = arg2; stack->arg3 = arg3; stack->context = ctx; - stack->context.Eax = retval; ctx.Esp = PtrToUlong( stack ); ctx.Eip = pLdrSystemDllInitBlock->pKiUserApcDispatcher; + frame.wow_context = &stack->context; pBTCpuSetContext( GetCurrentThread(), GetCurrentProcess(), NULL, &ctx ); + cpu_simulate(); } break; @@ -1035,14 +1047,15 @@ void WINAPI Wow64ApcRoutine( ULONG_PTR arg1, ULONG_PTR arg2, ULONG_PTR arg3, CON stack = (struct apc_stack_layout *)ULongToPtr( ctx.Sp & ~15 ) - 1; stack->func = arg1 >> 32; stack->context = ctx; - stack->context.R0 = retval; ctx.Sp = PtrToUlong( stack ); ctx.Pc = pLdrSystemDllInitBlock->pKiUserApcDispatcher; ctx.R0 = PtrToUlong( &stack->context ); ctx.R1 = arg1; ctx.R2 = arg2; ctx.R3 = arg3; + frame.wow_context = &stack->context; pBTCpuSetContext( GetCurrentThread(), GetCurrentProcess(), NULL, &ctx ); + cpu_simulate(); } break; } @@ -1112,7 +1125,7 @@ NTSTATUS WINAPI Wow64KiUserCallbackDispatcher( ULONG id, void *args, ULONG len, memcpy( args_data, args, len ); ctx.R0 = id; - ctx.R1 = PtrToUlong( args ); + ctx.R1 = PtrToUlong( args_data ); ctx.R2 = len; ctx.Sp = PtrToUlong( args_data ); ctx.Pc = pLdrSystemDllInitBlock->pKiUserCallbackDispatcher; diff --git a/include/winternl.h b/include/winternl.h index 95abf79812b..f2992b82857 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -1083,6 +1083,7 @@ typedef struct _TEB64 #define WOW64_TLS_CPURESERVED 1 #define WOW64_TLS_TEMPLIST 3 #define WOW64_TLS_USERCALLBACKDATA 5 +#define WOW64_TLS_APCLIST 7 #define WOW64_TLS_FILESYSREDIR 8 #define WOW64_TLS_MAX_NUMBER 19

1 0

Alexandre Julliard : ntdll/tests: Check the default stack information against the exe header.
by Alexandre Julliard March 7, 2023

March 7, 2023

Module: wine Branch: master Commit: c2a2f1caadae9cc7f33cdcc1bacd1bd243dd4b07 URL: https://gitlab.winehq.org/wine/wine/-/commit/c2a2f1caadae9cc7f33cdcc1bacd1b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 7 11:06:09 2023 +0100 ntdll/tests: Check the default stack information against the exe header. --- dlls/ntdll/tests/threadpool.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/threadpool.c b/dlls/ntdll/tests/threadpool.c index d8ca80a99a4..168f00c2852 100644 --- a/dlls/ntdll/tests/threadpool.c +++ b/dlls/ntdll/tests/threadpool.c @@ -579,6 +579,7 @@ static void CALLBACK simple2_cb(TP_CALLBACK_INSTANCE *instance, void *userdata) static void test_tp_simple(void) { + IMAGE_NT_HEADERS *nt = RtlImageNtHeader( NtCurrentTeb()->Peb->ImageBaseAddress ); TP_POOL_STACK_INFORMATION stack_info; TP_CALLBACK_ENVIRON environment; TP_CALLBACK_ENVIRON_V3 environment3; @@ -686,8 +687,8 @@ static void test_tp_simple(void) /* test querying and setting the stack size */ status = pTpQueryPoolStackInformation(pool, &stack_info); ok(!status, "TpQueryPoolStackInformation failed: %lx\n", status); - ok(stack_info.StackReserve == 2 * 1024 * 1024, "expected default StackReserve, got %ld\n", (ULONG)stack_info.StackReserve); - ok(stack_info.StackCommit == 4 * 1024, "expected default StackCommit, got %ld\n", (ULONG)stack_info.StackCommit); + ok(stack_info.StackReserve == nt->OptionalHeader.SizeOfStackReserve, "expected default StackReserve, got %Ix\n", stack_info.StackReserve); + ok(stack_info.StackCommit == nt->OptionalHeader.SizeOfStackCommit, "expected default StackCommit, got %Ix\n", stack_info.StackCommit); /* threadpool does not validate the stack size values */ stack_info.StackReserve = stack_info.StackCommit = 1;

1 0

Alexandre Julliard : ntdll/tests: Remove invalid instruction from KiUserExceptionDispatcher test.
by Alexandre Julliard March 7, 2023

March 7, 2023

Module: wine Branch: master Commit: 16227352a6649375cf6d7fe828ba74bdf28794b4 URL: https://gitlab.winehq.org/wine/wine/-/commit/16227352a6649375cf6d7fe828ba74… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 7 11:08:01 2023 +0100 ntdll/tests: Remove invalid instruction from KiUserExceptionDispatcher test. It trips up box86. --- dlls/ntdll/tests/exception.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 94b2ccf61a6..90d90f3b64a 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -1905,8 +1905,7 @@ static void test_kiuserexceptiondispatcher(void) 0x89, 0x79, 0x0c, /* mov %edi, 0xc(%ecx) */ 0x89, 0x69, 0x10, /* mov %ebp, 0x10(%ecx) */ 0x89, 0x61, 0x14, /* mov %esp, 0x14(%ecx) */ - - 0x67, 0x48, 0x8b, 0x71, 0xf0, /* mov -0x10(%ecx),%esi */ + 0x8b, 0x71, 0xf0, /* mov -0x10(%ecx),%esi */ 0xc3, /* ret */ };

1 0

Alexandre Julliard : wow64: In system calls always return the status from Wow64SystemServiceEx.
by Alexandre Julliard March 7, 2023

March 7, 2023

Module: wine Branch: master Commit: 419e4d69d6c3a4ea8b355f8b3fc211950eed0cdd URL: https://gitlab.winehq.org/wine/wine/-/commit/419e4d69d6c3a4ea8b355f8b3fc211… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 7 17:21:29 2023 +0100 wow64: In system calls always return the status from Wow64SystemServiceEx. --- dlls/wow64/syscall.c | 17 ++++++++++++++++- dlls/wow64cpu/cpu.c | 1 + 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/dlls/wow64/syscall.c b/dlls/wow64/syscall.c index dd3937640bc..1feeac083d9 100644 --- a/dlls/wow64/syscall.c +++ b/dlls/wow64/syscall.c @@ -143,6 +143,19 @@ static EXCEPTION_RECORD *exception_record_32to64( const EXCEPTION_RECORD32 *rec3 } +static NTSTATUS get_context_return_value( void *wow_context ) +{ + switch (current_machine) + { + case IMAGE_FILE_MACHINE_I386: + return ((I386_CONTEXT *)wow_context)->Eax; + case IMAGE_FILE_MACHINE_ARMNT: + return ((ARM_CONTEXT *)wow_context)->R0; + } + return 0; +} + + /********************************************************************** * call_user_exception_dispatcher */ @@ -400,9 +413,11 @@ NTSTATUS WINAPI wow64_NtContinue( UINT *args ) void *context = get_ptr( &args ); BOOLEAN alertable = get_ulong( &args ); + NTSTATUS status = get_context_return_value( context ); + pBTCpuSetContext( GetCurrentThread(), GetCurrentProcess(), NULL, context ); if (alertable) NtTestAlert(); - return STATUS_SUCCESS; + return status; } diff --git a/dlls/wow64cpu/cpu.c b/dlls/wow64cpu/cpu.c index 835353d9af8..13c94751d19 100644 --- a/dlls/wow64cpu/cpu.c +++ b/dlls/wow64cpu/cpu.c @@ -192,6 +192,7 @@ __ASM_GLOBAL_FUNC( syscall_32to64, "movq %rax,%rcx\n\t" /* syscall number */ "leaq 8(%r14),%rdx\n\t" /* parameters */ "call " __ASM_NAME("Wow64SystemServiceEx") "\n\t" + "movl %eax,0xb0(%r13)\n\t" /* context->Eax */ "syscall_32to64_return:\n\t" "movl 0x9c(%r13),%edi\n\t" /* context->Edi */

1 0

Alexandre Julliard : ntdll/tests: Allow zero size return for NtQueryDirectoryObject on Wow64.
by Alexandre Julliard March 7, 2023

March 7, 2023

Module: wine Branch: master Commit: 972a1192e0f96922b434e2fa4e2c5b5fadb74557 URL: https://gitlab.winehq.org/wine/wine/-/commit/972a1192e0f96922b434e2fa4e2c5b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 7 11:53:53 2023 +0100 ntdll/tests: Allow zero size return for NtQueryDirectoryObject on Wow64. --- dlls/ntdll/tests/om.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index d663ebcb00f..afe3bad33b8 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -2580,6 +2580,11 @@ static void test_query_directory(void) OBJECT_ATTRIBUTES attr; UNICODE_STRING string; NTSTATUS status; + BOOL is_wow64 = FALSE; + +#ifndef _WIN64 + if (!IsWow64Process( GetCurrentProcess(), &is_wow64 )) is_wow64 = FALSE; +#endif RtlInitUnicodeString( &string, L"\\BaseNamedObjects\\winetest" ); InitializeObjectAttributes( &attr, &string, 0, 0, NULL ); @@ -2591,14 +2596,14 @@ static void test_query_directory(void) status = NtQueryDirectoryObject( dir, info, 0, TRUE, TRUE, &context, &size ); ok( status == STATUS_NO_MORE_ENTRIES, "got %#lx\n", status ); ok( context == 0xdeadbeef, "got context %#lx\n", context ); - ok( size == sizeof(*info) || broken(!size) /* WoW64 */, "got size %lu\n", size ); + ok( size == sizeof(*info) || (is_wow64 && !size), "got size %lu\n", size ); context = 0xdeadbeef; size = 0xdeadbeef; status = NtQueryDirectoryObject( dir, info, 0, FALSE, TRUE, &context, &size ); todo_wine ok( status == STATUS_NO_MORE_ENTRIES, "got %#lx\n", status ); ok( context == 0xdeadbeef, "got context %#lx\n", context ); - todo_wine ok( size == sizeof(*info) || broken(!size) /* WoW64 */, "got size %lu\n", size ); + todo_wine ok( size == sizeof(*info) || (is_wow64 && !size), "got size %lu\n", size ); context = 0xdeadbeef; size = 0xdeadbeef; @@ -2606,7 +2611,7 @@ static void test_query_directory(void) status = NtQueryDirectoryObject( dir, info, sizeof(buffer), TRUE, TRUE, &context, &size ); ok( status == STATUS_NO_MORE_ENTRIES, "got %#lx\n", status ); ok( context == 0xdeadbeef, "got context %#lx\n", context ); - ok( size == sizeof(*info) || broken(!size) /* WoW64 */, "got size %lu\n", size ); + ok( size == sizeof(*info) || (is_wow64 && !size), "got size %lu\n", size ); if (size == sizeof(*info)) ok( !memcmp( &info[0], &empty_info, sizeof(*info) ), "entry was not cleared\n" ); @@ -2616,7 +2621,7 @@ static void test_query_directory(void) status = NtQueryDirectoryObject( dir, info, sizeof(buffer), FALSE, TRUE, &context, &size ); todo_wine ok( status == STATUS_NO_MORE_ENTRIES, "got %#lx\n", status ); ok( context == 0xdeadbeef, "got context %#lx\n", context ); - todo_wine ok( size == sizeof(*info) || broken(!size) /* WoW64 */, "got size %lu\n", size ); + todo_wine ok( size == sizeof(*info) || (is_wow64 && !size), "got size %lu\n", size ); if (size == sizeof(*info)) ok( !memcmp( &info[0], &empty_info, sizeof(*info) ), "entry was not cleared\n" ); @@ -2673,7 +2678,7 @@ static void test_query_directory(void) status = NtQueryDirectoryObject( dir, info, sizeof(buffer), TRUE, FALSE, &context, &size ); ok( status == STATUS_NO_MORE_ENTRIES, "got %#lx\n", status ); ok( context == 2, "got context %#lx\n", context ); - ok( size == sizeof(*info) || broken(!size) /* WoW64 */, "got size %lu\n", size ); + ok( size == sizeof(*info) || (is_wow64 && !size), "got size %lu\n", size ); memset( buffer, 0xcc, sizeof(buffer) ); status = NtQueryDirectoryObject( dir, info, sizeof(buffer), TRUE, TRUE, &context, &size );

1 0

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

March 6, 2023

Module: wine Branch: master Commit: 45e83cc8c28cece236f1537958f6e21b48193f2c URL: https://gitlab.winehq.org/wine/wine/-/commit/45e83cc8c28cece236f1537958f6e2… Author: Max Figura <maxfigura5061(a)gmail.com> Date: Mon Dec 12 17:23:28 2022 -0600 wined3d: Move the WINED3D_RS_WRAP8 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 | 4 +--- 4 files changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 46770084e98..caddae5c918 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -106,7 +106,6 @@ static const struct wined3d_state_entry_template misc_state_template_vk[] = {STATE_RENDER(WINED3D_RS_WRAP5), {STATE_RENDER(WINED3D_RS_WRAP0)}}, {STATE_RENDER(WINED3D_RS_WRAP6), {STATE_RENDER(WINED3D_RS_WRAP0)}}, {STATE_RENDER(WINED3D_RS_WRAP7), {STATE_RENDER(WINED3D_RS_WRAP0)}}, - {STATE_RENDER(WINED3D_RS_WRAP8), {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 56033b1d1a1..a1e0d880004 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_WRAP8: case WINED3D_RS_WRAP9: case WINED3D_RS_WRAP10: case WINED3D_RS_WRAP11: diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 98864c1a297..f8f9316d914 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2819,7 +2819,6 @@ static const struct wined3d_state_entry_template misc_state_template_no3d[] = {STATE_RENDER(WINED3D_RS_WRAP5), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_WRAP6), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_WRAP7), {STATE_VDECL}}, - {STATE_RENDER(WINED3D_RS_WRAP8), {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 0e1c4e77d47..c0606ae30e8 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -4689,7 +4689,6 @@ const struct wined3d_state_entry_template misc_state_template_gl[] = { 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_WRAP7), { STATE_RENDER(WINED3D_RS_WRAP0), NULL }, WINED3D_GL_EXT_NONE }, - { STATE_RENDER(WINED3D_RS_WRAP8), { 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 }, @@ -5476,8 +5475,7 @@ static void validate_state_table(struct wined3d_state_entry *state_table) {171, 171}, {174, 177}, {185, 193}, - {195, 197}, - {199, 209}, + {195, 209}, { 0, 0}, }; static const unsigned int simple_states[] =

1 0

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

March 6, 2023

Module: wine Branch: master Commit: caea3779a5bdc18feadaa5e8348a0be2fdda7fc9 URL: https://gitlab.winehq.org/wine/wine/-/commit/caea3779a5bdc18feadaa5e8348a0b… Author: Max Figura <maxfigura5061(a)gmail.com> Date: Mon Dec 12 17:16:30 2022 -0600 wined3d: Move the WINED3D_RS_WRAP10 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 4f6011ab271..81c0a3d613b 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -108,7 +108,6 @@ static const struct wined3d_state_entry_template misc_state_template_vk[] = {STATE_RENDER(WINED3D_RS_WRAP7), {STATE_RENDER(WINED3D_RS_WRAP0)}}, {STATE_RENDER(WINED3D_RS_WRAP8), {STATE_RENDER(WINED3D_RS_WRAP0)}}, {STATE_RENDER(WINED3D_RS_WRAP9), {STATE_RENDER(WINED3D_RS_WRAP0)}}, - {STATE_RENDER(WINED3D_RS_WRAP10), {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 54d4df13e3c..230118f2b90 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_WRAP10: case WINED3D_RS_WRAP11: case WINED3D_RS_WRAP12: case WINED3D_RS_WRAP13: diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 7b6e815f150..5f6ef4c5236 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2821,7 +2821,6 @@ static const struct wined3d_state_entry_template misc_state_template_no3d[] = {STATE_RENDER(WINED3D_RS_WRAP7), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_WRAP8), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_WRAP9), {STATE_VDECL}}, - {STATE_RENDER(WINED3D_RS_WRAP10), {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 63a241b2011..71710bae53a 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -4691,7 +4691,6 @@ const struct wined3d_state_entry_template misc_state_template_gl[] = { STATE_RENDER(WINED3D_RS_WRAP7), { STATE_RENDER(WINED3D_RS_WRAP0), NULL }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_WRAP8), { STATE_RENDER(WINED3D_RS_WRAP0), NULL }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_WRAP9), { STATE_RENDER(WINED3D_RS_WRAP0), NULL }, WINED3D_GL_EXT_NONE }, - { STATE_RENDER(WINED3D_RS_WRAP10), { 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 }, @@ -5479,7 +5478,7 @@ static void validate_state_table(struct wined3d_state_entry *state_table) {174, 177}, {185, 193}, {195, 197}, - {201, 209}, + {200, 209}, { 0, 0}, }; static const unsigned int simple_states[] =

1 0

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

March 6, 2023

Module: wine Branch: master Commit: 572daa341d9689916072101a11ca08f0f058e495 URL: https://gitlab.winehq.org/wine/wine/-/commit/572daa341d9689916072101a11ca08… Author: Max Figura <maxfigura5061(a)gmail.com> Date: Mon Dec 12 17:04:51 2022 -0600 wined3d: Move the WINED3D_RS_WRAP11 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 3bbea5b9889..4f6011ab271 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -109,7 +109,6 @@ static const struct wined3d_state_entry_template misc_state_template_vk[] = {STATE_RENDER(WINED3D_RS_WRAP8), {STATE_RENDER(WINED3D_RS_WRAP0)}}, {STATE_RENDER(WINED3D_RS_WRAP9), {STATE_RENDER(WINED3D_RS_WRAP0)}}, {STATE_RENDER(WINED3D_RS_WRAP10), {STATE_RENDER(WINED3D_RS_WRAP0)}}, - {STATE_RENDER(WINED3D_RS_WRAP11), {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 04ac2fce4b4..54d4df13e3c 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_WRAP11: case WINED3D_RS_WRAP12: case WINED3D_RS_WRAP13: case WINED3D_RS_WRAP14: diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index fd97afc878e..7b6e815f150 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2822,7 +2822,6 @@ static const struct wined3d_state_entry_template misc_state_template_no3d[] = {STATE_RENDER(WINED3D_RS_WRAP8), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_WRAP9), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_WRAP10), {STATE_VDECL}}, - {STATE_RENDER(WINED3D_RS_WRAP11), {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 ab6a8fb22c9..63a241b2011 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -4692,7 +4692,6 @@ const struct wined3d_state_entry_template misc_state_template_gl[] = { STATE_RENDER(WINED3D_RS_WRAP8), { STATE_RENDER(WINED3D_RS_WRAP0), NULL }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_WRAP9), { STATE_RENDER(WINED3D_RS_WRAP0), NULL }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_WRAP10), { STATE_RENDER(WINED3D_RS_WRAP0), NULL }, WINED3D_GL_EXT_NONE }, - { STATE_RENDER(WINED3D_RS_WRAP11), { 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 }, @@ -5480,7 +5479,7 @@ static void validate_state_table(struct wined3d_state_entry *state_table) {174, 177}, {185, 193}, {195, 197}, - {202, 209}, + {201, 209}, { 0, 0}, }; static const unsigned int simple_states[] =

1 0

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

March 6, 2023

Module: wine Branch: master Commit: 2df817d914ac0355b2dfcbc3760e1383122f4686 URL: https://gitlab.winehq.org/wine/wine/-/commit/2df817d914ac0355b2dfcbc3760e13… Author: Max Figura <maxfigura5061(a)gmail.com> Date: Mon Dec 12 17:19:25 2022 -0600 wined3d: Move the WINED3D_RS_WRAP9 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 81c0a3d613b..46770084e98 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -107,7 +107,6 @@ static const struct wined3d_state_entry_template misc_state_template_vk[] = {STATE_RENDER(WINED3D_RS_WRAP6), {STATE_RENDER(WINED3D_RS_WRAP0)}}, {STATE_RENDER(WINED3D_RS_WRAP7), {STATE_RENDER(WINED3D_RS_WRAP0)}}, {STATE_RENDER(WINED3D_RS_WRAP8), {STATE_RENDER(WINED3D_RS_WRAP0)}}, - {STATE_RENDER(WINED3D_RS_WRAP9), {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 230118f2b90..56033b1d1a1 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_WRAP9: case WINED3D_RS_WRAP10: case WINED3D_RS_WRAP11: case WINED3D_RS_WRAP12: diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 5f6ef4c5236..98864c1a297 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2820,7 +2820,6 @@ static const struct wined3d_state_entry_template misc_state_template_no3d[] = {STATE_RENDER(WINED3D_RS_WRAP6), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_WRAP7), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_WRAP8), {STATE_VDECL}}, - {STATE_RENDER(WINED3D_RS_WRAP9), {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 71710bae53a..0e1c4e77d47 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -4690,7 +4690,6 @@ const struct wined3d_state_entry_template misc_state_template_gl[] = { STATE_RENDER(WINED3D_RS_WRAP6), { STATE_RENDER(WINED3D_RS_WRAP0), NULL }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_WRAP7), { STATE_RENDER(WINED3D_RS_WRAP0), NULL }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_WRAP8), { STATE_RENDER(WINED3D_RS_WRAP0), NULL }, WINED3D_GL_EXT_NONE }, - { STATE_RENDER(WINED3D_RS_WRAP9), { 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 }, @@ -5478,7 +5477,7 @@ static void validate_state_table(struct wined3d_state_entry *state_table) {174, 177}, {185, 193}, {195, 197}, - {200, 209}, + {199, 209}, { 0, 0}, }; static const unsigned int simple_states[] =

1 0