August 2020 - Wine-commits - list.winehq.org

Alexandre Julliard : kernel32: Fix user handle conversion in GetConsoleWindow().
by Alexandre Julliard 20 Aug '20

20 Aug '20

Module: wine Branch: master Commit: 13ea90d80f7275e1ad4f3fc3c1c75b68bdbefbb4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=13ea90d80f7275e1ad4f3fc3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 20 21:44:20 2020 +0200 kernel32: Fix user handle conversion in GetConsoleWindow(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/console.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index 44df9463da..afbf9a91da 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -194,7 +194,7 @@ HWND WINAPI GetConsoleWindow(void) ret = DeviceIoControl( RtlGetCurrentPeb()->ProcessParameters->ConsoleHandle, IOCTL_CONDRV_GET_INPUT_INFO, NULL, 0, &info, sizeof(info), NULL, NULL ); - return ret ? (HWND)info.win : NULL; + return ret ? wine_server_ptr_handle(info.win) : NULL; }

1 0

Paul Gofman : include: Define _XSAVE_FORMAT structure.
by Alexandre Julliard 20 Aug '20

20 Aug '20

Module: wine Branch: master Commit: de1cb029f6e9bd6b8959695f5d0ae55188d9b723 URL: https://source.winehq.org/git/wine.git/?a=commit;h=de1cb029f6e9bd6b8959695f… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Aug 20 00:22:56 2020 +0300 include: Define _XSAVE_FORMAT structure. The structure is defined for both x86_64 and i386 (along with M128A) in (newer) Windows SDK. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_i386.c | 32 ++-------------------- dlls/ntdll/unix/signal_i386.c | 53 +++++++++-------------------------- dlls/ntdll/unix/system.c | 26 +----------------- include/winnt.h | 42 ++++++++++++++-------------- programs/winedbg/be_i386.c | 64 +++++++++++++------------------------------ 5 files changed, 57 insertions(+), 160 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=de1cb029f6e9bd6b8959…

1 0

Paul Gofman : include: Define extended context structures.
by Alexandre Julliard 20 Aug '20

20 Aug '20

Module: wine Branch: master Commit: 22f4b6fcf5014b6d98188253636c116e50446c44 URL: https://source.winehq.org/git/wine.git/?a=commit;h=22f4b6fcf5014b6d98188253… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Aug 20 00:22:57 2020 +0300 include: Define extended context structures. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winnt.h | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) diff --git a/include/winnt.h b/include/winnt.h index 38f7983cbf..8c5f24aff8 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -1297,6 +1297,64 @@ NTSYSAPI PVOID WINAPI RtlVirtualUnwind(ULONG,ULONG64,ULONG64,RUNTIME_FUNCTION*,C #endif /* __x86_64__ */ +#define XSTATE_LEGACY_FLOATING_POINT 0 +#define XSTATE_LEGACY_SSE 1 +#define XSTATE_GSSE 2 +#define XSTATE_AVX XSTATE_GSSE +#define XSTATE_MPX_BNDREGS 3 +#define XSTATE_MPX_BNDCSR 4 +#define XSTATE_AVX512_KMASK 5 +#define XSTATE_AVX512_ZMM_H 6 +#define XSTATE_AVX512_ZMM 7 +#define XSTATE_IPT 8 +#define XSTATE_CET_U 11 +#define XSTATE_LWP 62 + +typedef struct _YMMCONTEXT +{ + M128A Ymm0; + M128A Ymm1; + M128A Ymm2; + M128A Ymm3; + M128A Ymm4; + M128A Ymm5; + M128A Ymm6; + M128A Ymm7; + M128A Ymm8; + M128A Ymm9; + M128A Ymm10; + M128A Ymm11; + M128A Ymm12; + M128A Ymm13; + M128A Ymm14; + M128A Ymm15; +} +YMMCONTEXT, *PYMMCONTEXT; + +typedef struct _XSTATE +{ + ULONG64 Mask; + ULONG64 CompactionMask; + ULONG64 Reserved[6]; + YMMCONTEXT YmmContext; +} XSTATE, *PXSTATE; + +typedef struct _CONTEXT_CHUNK +{ + LONG Offset; + ULONG Length; +} CONTEXT_CHUNK, *PCONTEXT_CHUNK; + +typedef struct _CONTEXT_EX +{ + CONTEXT_CHUNK All; + CONTEXT_CHUNK Legacy; + CONTEXT_CHUNK XState; +#ifdef _WIN64 + ULONG64 align; +#endif +} CONTEXT_EX, *PCONTEXT_EX; + /* IA64 context definitions */ #ifdef __ia64__

1 0

Paul Gofman : include: Implement __cpuidex() function.
by Alexandre Julliard 20 Aug '20

20 Aug '20

Module: wine Branch: master Commit: 0e544824f507ee6efc6dac171cbf7b552c359eb7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0e544824f507ee6efc6dac17… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Aug 20 00:22:58 2020 +0300 include: Implement __cpuidex() function. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/intrin.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/include/msvcrt/intrin.h b/include/msvcrt/intrin.h index 5ad2776450..38496251d5 100644 --- a/include/msvcrt/intrin.h +++ b/include/msvcrt/intrin.h @@ -12,9 +12,13 @@ extern "C" { #endif #if defined(__i386__) || defined(__x86_64__) +static inline void __cpuidex(int info[4], int ax, int cx) +{ + __asm__ ("cpuid" : "=a"(info[0]), "=b" (info[1]), "=c"(info[2]), "=d"(info[3]) : "a"(ax), "c"(cx)); +} static inline void __cpuid(int info[4], int ax) { - __asm__ ("cpuid" : "=a"(info[0]), "=b" (info[1]), "=c"(info[2]), "=d"(info[3]) : "a"(ax), "c"(0)); + return __cpuidex(info, ax, 0); } #endif

1 0

Paul Gofman : wineboot: Initialize XState features in user_shared_data.
by Alexandre Julliard 20 Aug '20

20 Aug '20

Module: wine Branch: master Commit: 97b5ad7597bf2add39251d7379fc607bf1578478 URL: https://source.winehq.org/git/wine.git/?a=commit;h=97b5ad7597bf2add39251d73… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Aug 20 00:22:59 2020 +0300 wineboot: Initialize XState features in user_shared_data. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/virtual.c | 67 ++++++++++++++++++++++++++++++++++++++++++++ programs/wineboot/wineboot.c | 59 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 126 insertions(+) diff --git a/dlls/ntdll/tests/virtual.c b/dlls/ntdll/tests/virtual.c index beab744178..4a0a4a6b8e 100644 --- a/dlls/ntdll/tests/virtual.c +++ b/dlls/ntdll/tests/virtual.c @@ -516,9 +516,34 @@ static void test_NtMapViewOfSection(void) CloseHandle(process); } +#define SUPPORTED_XSTATE_FEATURES ((1 << XSTATE_LEGACY_FLOATING_POINT) | (1 << XSTATE_LEGACY_SSE) | (1 << XSTATE_AVX)) + static void test_user_shared_data(void) { + struct old_xstate_configuration + { + ULONG64 EnabledFeatures; + ULONG Size; + ULONG OptimizedSave:1; + ULONG CompactionEnabled:1; + XSTATE_FEATURE Features[MAXIMUM_XSTATE_FEATURES]; + }; + + static const ULONG feature_offsets[] = + { + 0, + 160, /*offsetof(XMM_SAVE_AREA32, XmmRegisters)*/ + 512 /* sizeof(XMM_SAVE_AREA32) */ + offsetof(XSTATE, YmmContext), + }; + static const ULONG feature_sizes[] = + { + 160, + 256, /*sizeof(M128A) * 16 */ + sizeof(YMMCONTEXT), + }; const KSHARED_USER_DATA *user_shared_data = (void *)0x7ffe0000; + XSTATE_CONFIGURATION xstate = user_shared_data->XState; + unsigned int i; ok(user_shared_data->NumberOfPhysicalPages == sbi.MmNumberOfPhysicalPages, "Got number of physical pages %#x, expected %#x.\n", @@ -534,6 +559,48 @@ static void test_user_shared_data(void) ok(user_shared_data->ActiveGroupCount == 1 || broken(!user_shared_data->ActiveGroupCount) /* before Win7 */, "Got unexpected ActiveGroupCount %u.\n", user_shared_data->ActiveGroupCount); + + if (!xstate.EnabledFeatures) + { + struct old_xstate_configuration *xs_old + = (struct old_xstate_configuration *)((char *)user_shared_data + 0x3e0); + + if (!xs_old->EnabledFeatures) + { + skip("XState features are not supported.\n"); + return; + } + + memset(&xstate, 0, sizeof(xstate)); + xstate.EnabledFeatures = xstate.EnabledVolatileFeatures = xs_old->EnabledFeatures; + memcpy(&xstate.Size, &xs_old->Size, sizeof(*xs_old) - offsetof(struct old_xstate_configuration, Size)); + for (i = 0; i < 3; ++i) + xstate.AllFeatures[i] = xs_old->Features[i].Size; + xstate.AllFeatureSize = 512 + sizeof(XSTATE); + } + + trace("XState EnabledFeatures %s.\n", wine_dbgstr_longlong(xstate.EnabledFeatures)); + ok((xstate.EnabledFeatures & SUPPORTED_XSTATE_FEATURES) == SUPPORTED_XSTATE_FEATURES, + "Got unexpected EnabledFeatures %s.\n", wine_dbgstr_longlong(xstate.EnabledFeatures)); + ok((xstate.EnabledVolatileFeatures & SUPPORTED_XSTATE_FEATURES) == xstate.EnabledFeatures, + "Got unexpected EnabledVolatileFeatures %s.\n", wine_dbgstr_longlong(xstate.EnabledVolatileFeatures)); + ok(xstate.Size >= 512 + sizeof(XSTATE), "Got unexpected Size %u.\n", xstate.Size); + if (xstate.CompactionEnabled) + ok(xstate.OptimizedSave, "Got zero OptimizedSave with compaction enabled.\n"); + ok(!xstate.AlignedFeatures, "Got unexpected AlignedFeatures %s.\n", + wine_dbgstr_longlong(xstate.AlignedFeatures)); + ok(xstate.AllFeatureSize >= 512 + sizeof(XSTATE), "Got unexpected AllFeatureSize %u.\n", + xstate.AllFeatureSize); + + for (i = 0; i < ARRAY_SIZE(feature_sizes); ++i) + { + ok(xstate.AllFeatures[i] == feature_sizes[i], "Got unexpected AllFeatures[%u] %u, expected %u.\n", i, + xstate.AllFeatures[i], feature_sizes[i]); + ok(xstate.Features[i].Size == feature_sizes[i], "Got unexpected Features[%u].Size %u, expected %u.\n", i, + xstate.Features[i].Size, feature_sizes[i]); + ok(xstate.Features[i].Offset == feature_offsets[i], "Got unexpected Features[%u].Offset %u, expected %u.\n", + i, xstate.Features[i].Offset, feature_offsets[i]); + } } START_TEST(virtual) diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c index 902f6af042..2f8b7169cf 100644 --- a/programs/wineboot/wineboot.c +++ b/programs/wineboot/wineboot.c @@ -191,6 +191,63 @@ static DWORD set_reg_value_dword( HKEY hkey, const WCHAR *name, DWORD value ) return RegSetValueExW( hkey, name, 0, REG_DWORD, (const BYTE *)&value, sizeof(value) ); } +#if defined(__i386__) || defined(__x86_64__) + +static void initialize_xstate_features(struct _KUSER_SHARED_DATA *data) +{ + XSTATE_CONFIGURATION *xstate = &data->XState; + unsigned int i; + int regs[4]; + + if (!data->ProcessorFeatures[PF_AVX_INSTRUCTIONS_AVAILABLE]) + return; + + __cpuidex(regs, 0, 0); + + TRACE("Max cpuid level %#x.\n", regs[0]); + if (regs[0] < 0xd) + return; + + __cpuidex(regs, 1, 0); + TRACE("CPU features %#x, %#x, %#x, %#x.\n", regs[0], regs[1], regs[2], regs[3]); + if (!(regs[2] & (0x1 << 27))) /* xsave OS enabled */ + return; + + __cpuidex(regs, 0xd, 0); + TRACE("XSAVE details %#x, %#x, %#x, %#x.\n", regs[0], regs[1], regs[2], regs[3]); + if (!(regs[0] & XSTATE_AVX)) + return; + + xstate->EnabledFeatures = (1 << XSTATE_LEGACY_FLOATING_POINT) | (1 << XSTATE_LEGACY_SSE) | (1 << XSTATE_AVX); + xstate->EnabledVolatileFeatures = xstate->EnabledFeatures; + xstate->Size = sizeof(XSAVE_FORMAT) + sizeof(XSTATE); + xstate->AllFeatureSize = regs[1]; + xstate->AllFeatures[0] = offsetof(XSAVE_FORMAT, XmmRegisters); + xstate->AllFeatures[1] = sizeof(M128A) * 16; + xstate->AllFeatures[2] = sizeof(YMMCONTEXT); + + for (i = 0; i < 3; ++i) + xstate->Features[i].Size = xstate->AllFeatures[i]; + + xstate->Features[1].Offset = xstate->Features[0].Size; + xstate->Features[2].Offset = sizeof(XSAVE_FORMAT) + offsetof(XSTATE, YmmContext); + + __cpuidex(regs, 0xd, 1); + xstate->OptimizedSave = regs[0] & 1; + xstate->CompactionEnabled = !!(regs[0] & 2); + + __cpuidex(regs, 0xd, 2); + TRACE("XSAVE feature 2 %#x, %#x, %#x, %#x.\n", regs[0], regs[1], regs[2], regs[3]); +} + +#else + +static void initialize_xstate_features(struct _KUSER_SHARED_DATA *data) +{ +} + +#endif + static void create_user_shared_data(void) { struct _KUSER_SHARED_DATA *data; @@ -276,6 +333,8 @@ static void create_user_shared_data(void) data->ActiveProcessorCount = NtCurrentTeb()->Peb->NumberOfProcessors; data->ActiveGroupCount = 1; + initialize_xstate_features( data ); + UnmapViewOfFile( data ); }

1 0

Paul Gofman : kernel32: Implement GetEnabledXStateFeatures().
by Alexandre Julliard 20 Aug '20

20 Aug '20

Module: wine Branch: master Commit: a4af2b2b70db96309172b226dc6163e90d565420 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a4af2b2b70db96309172b226… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Aug 20 00:23:00 2020 +0300 kernel32: Implement GetEnabledXStateFeatures(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-xstate-l1-1-0.spec | 2 +- dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/process.c | 9 ------ dlls/kernelbase/kernelbase.spec | 2 +- dlls/kernelbase/memory.c | 18 ++++++++++++ dlls/ntdll/exception.c | 10 +++++++ dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/tests/virtual.c | 33 +++++++++++++++++----- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 1 + include/ddk/wdm.h | 1 + include/winbase.h | 1 + 11 files changed, 61 insertions(+), 19 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a4af2b2b70db96309172…

1 0

Alexandre Julliard : ntdll: Call NtContinue() from LdrInitializeThunk() instead of returning.
by Alexandre Julliard 20 Aug '20

20 Aug '20

Module: wine Branch: master Commit: 4a7cd0f492affbc0eb347b97426b8c23f9a4f976 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4a7cd0f492affbc0eb347b97… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 20 15:27:30 2020 +0200 ntdll: Call NtContinue() from LdrInitializeThunk() instead of returning. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 3 ++- dlls/ntdll/ntdll_misc.h | 1 + dlls/ntdll/signal_arm.c | 11 +++++++++++ dlls/ntdll/signal_arm64.c | 11 +++++++++++ dlls/ntdll/signal_i386.c | 16 ++++++++++++++++ dlls/ntdll/signal_x86_64.c | 14 ++++++++++++++ dlls/ntdll/virtual.c | 16 ++++++++++++++++ 7 files changed, 71 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 6290cbcb4e..54d56f4e14 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -3416,7 +3416,7 @@ void WINAPI LdrInitializeThunk( CONTEXT *context, void **entry, ULONG_PTR unknow WINE_MODREF *wm; LPCWSTR load_path = NtCurrentTeb()->Peb->ProcessParameters->DllPath.Buffer; - if (process_detaching) return; + if (process_detaching) NtTerminateThread( GetCurrentThread(), 0 ); RtlEnterCriticalSection( &loader_section ); @@ -3486,6 +3486,7 @@ void WINAPI LdrInitializeThunk( CONTEXT *context, void **entry, ULONG_PTR unknow } RtlLeaveCriticalSection( &loader_section ); + signal_start_thread( context ); } diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index a97dadb2a5..63ceac42e9 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -65,6 +65,7 @@ extern void init_unix_codepage(void) DECLSPEC_HIDDEN; extern void init_locale( HMODULE module ) DECLSPEC_HIDDEN; extern void init_user_process_params(void) DECLSPEC_HIDDEN; extern NTSTATUS restart_process( RTL_USER_PROCESS_PARAMETERS *params, NTSTATUS status ) DECLSPEC_HIDDEN; +extern void CDECL DECLSPEC_NORETURN signal_start_thread( CONTEXT *ctx ) DECLSPEC_HIDDEN; /* server support */ extern BOOL is_wow64 DECLSPEC_HIDDEN; diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index ba455ea71e..1041dadf86 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -263,6 +263,17 @@ USHORT WINAPI RtlCaptureStackBackTrace( ULONG skip, ULONG count, PVOID *buffer, return 0; } +/*********************************************************************** + * signal_start_thread + */ +__ASM_GLOBAL_FUNC( signal_start_thread, + "mov sp, r0\n\t" /* context */ + "and r0, #~0xff0\n\t" /* round down to page size */ + "bl " __ASM_NAME("virtual_clear_thread_stack") "\n\t" + "mov r1, #1\n\t" + "mov r0, sp\n\t" + "b " __ASM_NAME("NtContinue") ) + /********************************************************************** * DbgBreakPoint (NTDLL.@) */ diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index a35e48c1d6..e3102f7bdf 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -1188,6 +1188,17 @@ USHORT WINAPI RtlCaptureStackBackTrace( ULONG skip, ULONG count, PVOID *buffer, return 0; } +/*********************************************************************** + * signal_start_thread + */ +__ASM_GLOBAL_FUNC( signal_start_thread, + "mov sp, x0\n\t" /* context */ + "and x0, x0, #~0xfff\n\t" /* round down to page size */ + "bl " __ASM_NAME("virtual_clear_thread_stack") "\n\t" + "mov x0, sp\n\t" + "mov x1, #1\n\t" + "b " __ASM_NAME("NtContinue") ) + /********************************************************************** * DbgBreakPoint (NTDLL.@) */ diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index b65beb7215..8cdce3384a 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -498,6 +498,22 @@ USHORT WINAPI RtlCaptureStackBackTrace( ULONG skip, ULONG count, PVOID *buffer, } +/*********************************************************************** + * signal_start_thread + */ +__ASM_GLOBAL_FUNC( signal_start_thread, + "movl 4(%esp),%esi\n\t" /* context */ + "leal -12(%esi),%eax\n\t" + "movl %eax,%esp\n\t" + /* clear the stack */ + "andl $~0xfff,%eax\n\t" /* round down to page size */ + "movl %eax,(%esp)\n\t" + "call " __ASM_NAME("virtual_clear_thread_stack") "\n\t" + /* switch to the initial context */ + "movl $1,4(%esp)\n\t" + "movl %esi,(%esp)\n\t" + "call " __ASM_STDCALL("NtContinue", 8) ) + /********************************************************************** * DbgBreakPoint (NTDLL.@) */ diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 40ed53c10d..e1cf7f3e01 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -1477,6 +1477,20 @@ USHORT WINAPI RtlCaptureStackBackTrace( ULONG skip, ULONG count, PVOID *buffer, } +/*********************************************************************** + * signal_start_thread + */ +__ASM_GLOBAL_FUNC( signal_start_thread, + "movq %rcx,%rbx\n\t" /* context */ + "leaq -32(%rcx),%rcx\n\t" + "movq %rcx,%rsp\n\t" + "andq $~0xfff,%rcx\n\t" /* round down to page size */ + "call " __ASM_NAME("virtual_clear_thread_stack") "\n\t" + "movl $1,%edx\n\t" + "movq %rbx,%rcx\n\t" + "call " __ASM_NAME("NtContinue") ) + + /********************************************************************** * DbgBreakPoint (NTDLL.@) */ diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 3ba4b8afbc..64eef6aa84 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -106,6 +106,22 @@ void WINAPI RtlFreeUserStack( void *stack ) NtFreeVirtualMemory( NtCurrentProcess(), &stack, &size, MEM_RELEASE ); } + +/*********************************************************************** + * virtual_clear_thread_stack + * + * Clear the stack contents before calling the main entry point, some broken apps need that. + */ +void CDECL virtual_clear_thread_stack( void *stack_end ) +{ + void *stack = NtCurrentTeb()->Tib.StackLimit; + SIZE_T size = (char *)stack_end - (char *)stack; + + NtFreeVirtualMemory( GetCurrentProcess(), &stack, &size, MEM_DECOMMIT ); + NtAllocateVirtualMemory( GetCurrentProcess(), &stack, 0, &size, MEM_COMMIT, PAGE_READWRITE ); +} + + /*********************************************************************** * __wine_locked_recvmsg */

1 0

Alexandre Julliard : ntdll: Don't expect LdrInitializeThunk() to return to the Unix side.
by Alexandre Julliard 20 Aug '20

20 Aug '20

Module: wine Branch: master Commit: 53e0bf2f9f0f9876ca89e4c9133d9d5265b3e9dd URL: https://source.winehq.org/git/wine.git/?a=commit;h=53e0bf2f9f0f9876ca89e4c9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 20 15:30:08 2020 +0200 ntdll: Don't expect LdrInitializeThunk() to return to the Unix side. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/server.c | 2 +- dlls/ntdll/unix/signal_arm.c | 23 ++++++++----------- dlls/ntdll/unix/signal_arm64.c | 49 ++++++++++------------------------------- dlls/ntdll/unix/signal_i386.c | 25 +++++++++------------ dlls/ntdll/unix/signal_x86_64.c | 25 +++++++++------------ dlls/ntdll/unix/thread.c | 3 ++- dlls/ntdll/unix/unix_private.h | 2 +- dlls/ntdll/unix/virtual.c | 15 ------------- 8 files changed, 45 insertions(+), 99 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=53e0bf2f9f0f9876ca89…

1 0

Alexandre Julliard : ntdll: Unwind the syscall frame when calling KiUserApcDispatcher().
by Alexandre Julliard 20 Aug '20

20 Aug '20

Module: wine Branch: master Commit: a686759f1d7aee67b5786b72e81a4e4fcf3f3c02 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a686759f1d7aee67b5786b72… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 20 08:24:00 2020 +0200 ntdll: Unwind the syscall frame when calling KiUserApcDispatcher(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/server.c | 10 ++++---- dlls/ntdll/unix/signal_arm.c | 56 +++++++++++++++++++++++++++++------------ dlls/ntdll/unix/signal_arm64.c | 55 +++++++++++++++++++++++++++++----------- dlls/ntdll/unix/signal_i386.c | 53 +++++++++++++++++++++++++++----------- dlls/ntdll/unix/signal_x86_64.c | 50 ++++++++++++++++++++++++------------ dlls/ntdll/unix/unix_private.h | 6 +++-- 6 files changed, 161 insertions(+), 69 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a686759f1d7aee67b578…

1 0

Alexandre Julliard : ntdll: Unwind the syscall frame in NtSetContextThread().
by Alexandre Julliard 20 Aug '20

20 Aug '20

Module: wine Branch: master Commit: 77fbf3a9fde517ecb4d23e0bc121668206fec2f3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=77fbf3a9fde517ecb4d23e0b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 20 18:23:24 2020 +0200 ntdll: Unwind the syscall frame in NtSetContextThread(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_arm.c | 7 ++++++- dlls/ntdll/unix/signal_arm64.c | 2 ++ dlls/ntdll/unix/signal_i386.c | 3 +++ dlls/ntdll/unix/signal_x86_64.c | 4 ++++ 4 files changed, 15 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/signal_arm.c b/dlls/ntdll/unix/signal_arm.c index 270a23ad71..175e86168a 100644 --- a/dlls/ntdll/unix/signal_arm.c +++ b/dlls/ntdll/unix/signal_arm.c @@ -461,7 +461,12 @@ NTSTATUS WINAPI NtSetContextThread( HANDLE handle, const CONTEXT *context ) context_to_server( &server_context, context ); ret = set_thread_context( handle, &server_context, &self ); - if (self && ret == STATUS_SUCCESS) set_cpu_context( context ); + if (self && ret == STATUS_SUCCESS) + { + struct syscall_frame *frame = arm_thread_data()->syscall_frame; + arm_thread_data()->syscall_frame = frame->prev_frame; + set_cpu_context( context ); + } return ret; } diff --git a/dlls/ntdll/unix/signal_arm64.c b/dlls/ntdll/unix/signal_arm64.c index 8c03357b76..52f00323a0 100644 --- a/dlls/ntdll/unix/signal_arm64.c +++ b/dlls/ntdll/unix/signal_arm64.c @@ -520,6 +520,8 @@ NTSTATUS WINAPI NtSetContextThread( HANDLE handle, const CONTEXT *context ) } if (self && ret == STATUS_SUCCESS) { + struct syscall_frame *frame = arm64_thread_data()->syscall_frame; + arm64_thread_data()->syscall_frame = frame->prev_frame; InterlockedExchangePointer( (void **)&arm64_thread_data()->context, (void *)context ); raise( SIGUSR2 ); } diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c index c70b381547..b9cc3ee46e 100644 --- a/dlls/ntdll/unix/signal_i386.c +++ b/dlls/ntdll/unix/signal_i386.c @@ -870,6 +870,9 @@ static inline void restore_context( const CONTEXT *context, ucontext_t *sigconte */ extern void set_full_cpu_context( const CONTEXT *context ); __ASM_GLOBAL_FUNC( set_full_cpu_context, + "movl %fs:0x1f8,%eax\n\t" /* x86_thread_data()->syscall_frame */ + "movl (%eax),%eax\n\t" /* frame->prev_frame */ + "movl %eax,%fs:0x1f8\n\t" "movl 4(%esp),%ecx\n\t" "movw 0x8c(%ecx),%gs\n\t" /* SegGs */ "movw 0x90(%ecx),%fs\n\t" /* SegFs */ diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index 734c6b92a5..79b69cccc5 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -1708,7 +1708,11 @@ NTSTATUS WINAPI NtSetContextThread( HANDLE handle, const CONTEXT *context ) if (!(flags & CONTEXT_CONTROL)) FIXME( "setting partial context (%x) not supported\n", flags ); else + { + struct syscall_frame *frame = amd64_thread_data()->syscall_frame; + amd64_thread_data()->syscall_frame = frame->prev_frame; set_full_cpu_context( context ); + } } return ret; }

1 0