June 2022 - Wine-Devel - list.winehq.org

Re: [PATCH vkd3d 1/6] vkd3d-shader/hlsl: Fold constant swizzles.

by Zebediah Figura

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com>

June 27, 2022

[PATCH 1/1] wow64: Respect the large address aware flag.

by Brendan Shanks

From: Brendan Shanks <bshanks(a)codeweavers.com> --- dlls/wow64/process.c | 2 +- dlls/wow64/syscall.c | 14 +++++++++++++- dlls/wow64/wow64_private.h | 3 ++- 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/dlls/wow64/process.c b/dlls/wow64/process.c index 0c6726b9c6e..849312cc691 100644 --- a/dlls/wow64/process.c +++ b/dlls/wow64/process.c @@ -1118,7 +1118,7 @@ NTSTATUS WINAPI wow64_NtSetInformationProcess( UINT *args ) PROCESS_STACK_ALLOCATION_INFORMATION info; info.ReserveSize = stack->ReserveSize; - info.ZeroBits = stack->ZeroBits ? stack->ZeroBits : 0x7fffffff; + info.ZeroBits = stack->ZeroBits ? stack->ZeroBits : (ULONG_PTR)user_space_limit; if (!(status = NtSetInformationProcess( handle, class, &info, sizeof(info) ))) stack->StackBase = PtrToUlong( info.StackBase ); return status; diff --git a/dlls/wow64/syscall.c b/dlls/wow64/syscall.c index 7cab0894738..835c8b88105 100644 --- a/dlls/wow64/syscall.c +++ b/dlls/wow64/syscall.c @@ -36,6 +36,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(wow); USHORT native_machine = 0; USHORT current_machine = 0; ULONG_PTR args_alignment = 0; +void *user_space_limit = (void *)0x7fffffff; typedef NTSTATUS (WINAPI *syscall_thunk)( UINT *args ); @@ -98,7 +99,18 @@ void *dummy = RtlUnwind; BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, void *reserved ) { - if (reason == DLL_PROCESS_ATTACH) LdrDisableThreadCalloutsForDll( inst ); + if (reason == DLL_PROCESS_ATTACH) + { + NTSTATUS status; + SYSTEM_BASIC_INFORMATION info; + + LdrDisableThreadCalloutsForDll( inst ); + + if (!(status = NtQuerySystemInformation( SystemEmulationBasicInformation, &info, sizeof(info), NULL ))) + user_space_limit = info.HighestUserAddress; + else + ERR( "could not retrieve address space limit: %lx\n", status ); + } return TRUE; } diff --git a/dlls/wow64/wow64_private.h b/dlls/wow64/wow64_private.h index b26148023db..c6e38964413 100644 --- a/dlls/wow64/wow64_private.h +++ b/dlls/wow64/wow64_private.h @@ -39,6 +39,7 @@ extern BOOL get_file_redirect( OBJECT_ATTRIBUTES *attr ) DECLSPEC_HIDDEN; extern USHORT native_machine DECLSPEC_HIDDEN; extern USHORT current_machine DECLSPEC_HIDDEN; extern ULONG_PTR args_alignment DECLSPEC_HIDDEN; +extern void *user_space_limit DECLSPEC_HIDDEN; extern SYSTEM_DLL_INIT_BLOCK *pLdrSystemDllInitBlock DECLSPEC_HIDDEN; struct object_attr64 @@ -83,7 +84,7 @@ static inline ULONG64 get_ulong64( UINT **args ) static inline ULONG_PTR get_zero_bits( ULONG_PTR zero_bits ) { - return zero_bits ? zero_bits : 0x7fffffff; + return zero_bits ? zero_bits : (ULONG_PTR)user_space_limit; } static inline void **addr_32to64( void **addr, ULONG *addr32 ) -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/328

June 27, 2022

[PATCH 0/1] MR328: wow64: Respect the large address aware flag.

by Brendan Shanks (＠bshanks)

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/328

June 27, 2022

[PATCH 3/3] ntdll/tests: Test setting the return value via alertable NtContinue().

by Zebediah Figura

From: Zebediah Figura <zfigura(a)codeweavers.com> This is currently broken on WoW64. --- dlls/ntdll/tests/exception.c | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 748ee0e52ee..753a44c769b 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -8775,6 +8775,7 @@ static void test_user_apc(void) NTSTATUS status; CONTEXT context; LONG pass; + int ret; if (!pNtQueueApcThread) { @@ -8797,16 +8798,20 @@ static void test_user_apc(void) 0xc9, /* leave */ 0xc3, /* ret */ }; - void (__cdecl *func)(void *capture, CONTEXT *context) = code_mem; + int (__cdecl *func)(void *capture, CONTEXT *context) = code_mem; memcpy(code_mem, code, sizeof(code)); - func(RtlCaptureContext, &context); + ret = func(RtlCaptureContext, &context); /* work around broken RtlCaptureContext on Windows < 7 which doesn't set * ContextFlags */ context.ContextFlags = CONTEXT_FULL; } #else - RtlCaptureContext(&context); + { + int (WINAPI *func)(CONTEXT *context) = (void *)RtlCaptureContext; + + ret = func(&context); + } #endif InterlockedIncrement(&pass); @@ -8815,6 +8820,16 @@ static void test_user_apc(void) /* Try to make sure context data is far enough below context.Esp. */ CONTEXT c[4]; +#ifdef __i386__ + context.Eax = 0xabacab; +#elif defined(__x86_64__) + context.Rax = 0xabacab; +#elif defined(__arm__) + context.R0 = 0xabacab; +#elif defined(__aarch64__) + context.X0 = 0xabacab; +#endif + c[0] = context; test_apc_called = FALSE; @@ -8830,6 +8845,7 @@ static void test_user_apc(void) ok(0, "Should not get here, status %#lx.\n", status); return; } + ok(ret == 0xabacab, "Got return value %#x.\n", ret); ok(pass == 3, "Got unexpected pass %ld.\n", pass); ok(test_apc_called, "Test user APC was not called.\n"); } -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/327

June 27, 2022

[PATCH 2/3] ntdll/tests: Fix test_user_apc() on Windows < 7.

by Zebediah Figura

From: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/ntdll/tests/exception.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 86f2f5d6cb2..748ee0e52ee 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -8801,6 +8801,9 @@ static void test_user_apc(void) memcpy(code_mem, code, sizeof(code)); func(RtlCaptureContext, &context); + /* work around broken RtlCaptureContext on Windows < 7 which doesn't set + * ContextFlags */ + context.ContextFlags = CONTEXT_FULL; } #else RtlCaptureContext(&context); @@ -8824,8 +8827,7 @@ static void test_user_apc(void) ok(!status, "Got unexpected status %#lx.\n", status); status = NtContinue(&c[0], TRUE ); - /* Broken before Win7, in that case NtContinue returns here instead of restoring context after calling APC. */ - ok(broken(TRUE), "Should not get here, status %#lx.\n", status); + ok(0, "Should not get here, status %#lx.\n", status); return; } ok(pass == 3, "Got unexpected pass %ld.\n", pass); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/327

June 27, 2022

[PATCH 1/3] ntdll/tests: Fix test_user_apc() on i386.

by Zebediah Figura

From: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/ntdll/tests/exception.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 820e435bc1b..86f2f5d6cb2 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -8784,7 +8784,27 @@ static void test_user_apc(void) pass = 0; InterlockedIncrement(&pass); +#ifdef __i386__ + { + /* RtlCaptureContext puts the return address of the caller's stack + * frame into %eip, so we need a thunk to get it to return here */ + static const BYTE code[] = + { + 0x55, /* pushl %ebp */ + 0x89, 0xe5, /* movl %esp, %ebp */ + 0xff, 0x75, 0x0c, /* pushl 0xc(%ebp) */ + 0xff, 0x55, 0x08, /* call *0x8(%ebp) */ + 0xc9, /* leave */ + 0xc3, /* ret */ + }; + void (__cdecl *func)(void *capture, CONTEXT *context) = code_mem; + + memcpy(code_mem, code, sizeof(code)); + func(RtlCaptureContext, &context); + } +#else RtlCaptureContext(&context); +#endif InterlockedIncrement(&pass); if (pass == 2) -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/327

June 27, 2022

[PATCH 0/3] MR327: ntdll/tests: Tests for bug 53270.

by Zebediah Figura (＠zfigura)

I don't know how to fix the bug itself, though. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/327

June 27, 2022

Re: [PATCH v2 0/2] MR323: winebus.sys: Cleanup unixlib interface to remove pointers. - approved

by Alexandre Julliard (＠julliard)

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/323

June 27, 2022

Re: [PATCH v2 0/1] MR324: vbscript: Use return_null in more places. - approved

by Alexandre Julliard (＠julliard)

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/324

June 27, 2022

Re: [PATCH v3 0/5] MR321: win32u: menu conversion - approved

by Alexandre Julliard (＠julliard)

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/321

June 27, 2022