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

Jacek Caban : condrv: Implement initial ioctl processing.
by Alexandre Julliard 21 Aug '20

21 Aug '20

Module: wine Branch: master Commit: 8231dbf04961356a74bf026cfd3e359605ddc81e URL: https://source.winehq.org/git/wine.git/?a=commit;h=8231dbf04961356a74bf026c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 20 23:51:05 2020 +0200 condrv: Implement initial ioctl processing. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/conhost/conhost.c | 69 ++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 67 insertions(+), 2 deletions(-) diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index 27283e415b..2014ca2260 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -25,6 +25,7 @@ #include <winuser.h> #include <winternl.h> +#include "wine/server.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(conhost); @@ -34,6 +35,68 @@ struct console HANDLE server; /* console server handle */ }; +static void *ioctl_buffer; +static size_t ioctl_buffer_size; + +static void *alloc_ioctl_buffer( size_t size ) +{ + if (size > ioctl_buffer_size) + { + void *new_buffer; + if (!(new_buffer = realloc( ioctl_buffer, size ))) return NULL; + ioctl_buffer = new_buffer; + ioctl_buffer_size = size; + } + return ioctl_buffer; +} + +static NTSTATUS console_input_ioctl( struct console *console, unsigned int code, const void *in_data, + size_t in_size, size_t *out_size ) +{ + FIXME( "unsupported ioctl %x\n", code ); + return STATUS_NOT_SUPPORTED; +} + +static NTSTATUS process_console_ioctls( struct console *console ) +{ + size_t out_size = 0, in_size; + unsigned int code; + NTSTATUS status = STATUS_SUCCESS; + + for (;;) + { + if (status) out_size = 0; + + SERVER_START_REQ( get_next_console_request ) + { + req->handle = wine_server_obj_handle( console->server ); + req->status = status; + wine_server_add_data( req, ioctl_buffer, out_size ); + wine_server_set_reply( req, ioctl_buffer, ioctl_buffer_size ); + status = wine_server_call( req ); + code = reply->code; + out_size = reply->out_size; + in_size = wine_server_reply_size( reply ); + } + SERVER_END_REQ; + + if (status == STATUS_PENDING) return STATUS_SUCCESS; + if (status == STATUS_BUFFER_OVERFLOW) + { + if (!alloc_ioctl_buffer( out_size )) return STATUS_NO_MEMORY; + status = STATUS_SUCCESS; + continue; + } + if (status) + { + TRACE( "failed to get next request: %#x\n", status ); + return status; + } + + status = console_input_ioctl( console, code, ioctl_buffer, in_size, &out_size ); + } +} + static int main_loop( struct console *console, HANDLE signal ) { HANDLE signal_event = NULL; @@ -52,6 +115,8 @@ static int main_loop( struct console *console, HANDLE signal ) if (status && status != STATUS_PENDING) return 1; } + if (!alloc_ioctl_buffer( 4096 )) return 1; + wait_handles[wait_cnt++] = console->server; if (signal) wait_handles[wait_cnt++] = signal_event; @@ -62,8 +127,8 @@ static int main_loop( struct console *console, HANDLE signal ) switch (res) { case WAIT_OBJECT_0: - FIXME( "console ioctls not yet implemented\n" ); - return 1; + if (process_console_ioctls( console )) return 0; + break; case WAIT_OBJECT_0 + 1: if (signal_io.Status || signal_io.Information != sizeof(signal_id))

1 0

Jacek Caban : conhost: Implement IOCTL_CONDRV_GET_MODE.
by Alexandre Julliard 21 Aug '20

21 Aug '20

Module: wine Branch: master Commit: 3c9d10d756746ea21ec83f78de42ede871a0222a URL: https://source.winehq.org/git/wine.git/?a=commit;h=3c9d10d756746ea21ec83f78… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 20 23:51:17 2020 +0200 conhost: Implement IOCTL_CONDRV_GET_MODE. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/console.c | 2 -- programs/conhost/conhost.c | 24 ++++++++++++++++++++++-- 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 42fd26efe5..b45e707ac8 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -4121,9 +4121,7 @@ START_TEST(console) DWORD mode; ret = GetConsoleMode(hConIn, &mode); - todo_wine ok(ret, "GetConsoleMode failed: %u\n", GetLastError()); - todo_wine ok(mode == (ENABLE_PROCESSED_INPUT | ENABLE_LINE_INPUT | ENABLE_ECHO_INPUT | ENABLE_MOUSE_INPUT | ENABLE_INSERT_MODE | ENABLE_QUICK_EDIT_MODE | ENABLE_EXTENDED_FLAGS | ENABLE_AUTO_POSITION), "mode = %x\n", mode); diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index 2014ca2260..dae30d1576 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -25,6 +25,7 @@ #include <winuser.h> #include <winternl.h> +#include "wine/condrv.h" #include "wine/server.h" #include "wine/debug.h" @@ -33,6 +34,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(conhost); struct console { HANDLE server; /* console server handle */ + unsigned int mode; /* input mode */ }; static void *ioctl_buffer; @@ -53,8 +55,22 @@ static void *alloc_ioctl_buffer( size_t size ) static NTSTATUS console_input_ioctl( struct console *console, unsigned int code, const void *in_data, size_t in_size, size_t *out_size ) { - FIXME( "unsupported ioctl %x\n", code ); - return STATUS_NOT_SUPPORTED; + switch (code) + { + case IOCTL_CONDRV_GET_MODE: + { + DWORD *mode; + TRACE( "returning mode %x\n", console->mode ); + if (in_size || *out_size != sizeof(*mode)) return STATUS_INVALID_PARAMETER; + if (!(mode = alloc_ioctl_buffer( *out_size ))) return STATUS_NO_MEMORY; + *mode = console->mode; + return STATUS_SUCCESS; + } + + default: + FIXME( "unsupported ioctl %x\n", code ); + return STATUS_NOT_SUPPORTED; + } } static NTSTATUS process_console_ioctls( struct console *console ) @@ -162,6 +178,10 @@ int __cdecl wmain(int argc, WCHAR *argv[]) for (i = 0; i < argc; i++) TRACE("%s ", wine_dbgstr_w(argv[i])); TRACE("\n"); + console.mode = ENABLE_PROCESSED_INPUT | ENABLE_LINE_INPUT | + ENABLE_ECHO_INPUT | ENABLE_MOUSE_INPUT | ENABLE_INSERT_MODE | + ENABLE_QUICK_EDIT_MODE | ENABLE_EXTENDED_FLAGS | ENABLE_AUTO_POSITION; + for (i = 1; i < argc; i++) { if (!wcscmp( argv[i], L"--headless"))

1 0

Paul Gofman : ntdll/tests: Add test for xstate in extended context.
by Alexandre Julliard 21 Aug '20

21 Aug '20

Module: wine Branch: master Commit: 3f562e0b919083bbb988474d50f70b9c5370e29d URL: https://source.winehq.org/git/wine.git/?a=commit;h=3f562e0b919083bbb988474d… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Aug 21 02:42:11 2020 +0300 ntdll/tests: Add test for xstate in extended context. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/exception.c | 160 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 160 insertions(+) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 9e33417c7f..bca95676a0 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -30,6 +30,7 @@ #include "winternl.h" #include "excpt.h" #include "wine/test.h" +#include "intrin.h" static void *code_mem; @@ -43,6 +44,7 @@ static ULONG (WINAPI *pRtlRemoveVectoredExceptionHandler)(PVOID handler); static PVOID (WINAPI *pRtlAddVectoredContinueHandler)(ULONG first, PVECTORED_EXCEPTION_HANDLER func); static ULONG (WINAPI *pRtlRemoveVectoredContinueHandler)(PVOID handler); static void (WINAPI *pRtlSetUnhandledExceptionFilter)(PRTL_EXCEPTION_FILTER filter); +static ULONG64 (WINAPI *pRtlGetEnabledExtendedFeatures)(ULONG64); static NTSTATUS (WINAPI *pNtReadVirtualMemory)(HANDLE, const void*, void*, SIZE_T, SIZE_T*); static NTSTATUS (WINAPI *pNtTerminateProcess)(HANDLE handle, LONG exit_code); static NTSTATUS (WINAPI *pNtQueryInformationProcess)(HANDLE, PROCESSINFOCLASS, PVOID, ULONG, PULONG); @@ -5420,6 +5422,161 @@ static void test_unload_trace(void) } } +#if defined(__i386__) || defined(__x86_64__) + +static const unsigned int test_extended_context_data[8] = {1, 2, 3, 4, 5, 6, 7, 8}; +static const unsigned test_extended_context_spoil_data1[8] = {0x10, 0x20, 0x30, 0x40, 0x50, 0x60, 0x70, 0x80}; +static const unsigned test_extended_context_spoil_data2[8] = {0x15, 0x25, 0x35, 0x45, 0x55, 0x65, 0x75, 0x85}; + +static BOOL test_extended_context_modified_state; + +static DWORD test_extended_context_handler(EXCEPTION_RECORD *rec, EXCEPTION_REGISTRATION_RECORD *frame, + CONTEXT *context, EXCEPTION_REGISTRATION_RECORD **dispatcher) +{ + static const ULONG64 expected_compaction_mask = 0x8000000000000004; + CONTEXT_EX *xctx = (CONTEXT_EX *)(context + 1); + unsigned int *context_ymm_data; + DWORD expected_min_offset; + BOOL compaction; + int regs[4]; + XSTATE *xs; + + /* Since we got xstates enabled by OS this cpuid level should be supported. */ + __cpuidex(regs, 0xd, 1); + compaction = regs[0] & 2; + todo_wine ok((context->ContextFlags & (CONTEXT_FULL | CONTEXT_XSTATE)) == (CONTEXT_FULL | CONTEXT_XSTATE), + "Got unexpected ContextFlags %#x.\n", context->ContextFlags); + + if ((context->ContextFlags & (CONTEXT_FULL | CONTEXT_XSTATE)) != (CONTEXT_FULL | CONTEXT_XSTATE)) + goto done; + +#ifdef __x86_64__ + { + /* Unwind contexts do not inherit xstate information. */ + DISPATCHER_CONTEXT *dispatch = (DISPATCHER_CONTEXT *)dispatcher; + + ok(!(dispatch->ContextRecord->ContextFlags & 0x40), "Got unexpected ContextRecord->ContextFlags %#x.\n", + dispatch->ContextRecord->ContextFlags); + } +#endif + + ok(xctx->Legacy.Offset == -(int)(sizeof(CONTEXT)), "Got unexpected Legacy.Offset %d.\n", xctx->Legacy.Offset); + ok(xctx->Legacy.Length == sizeof(CONTEXT), "Got unexpected Legacy.Length %d.\n", xctx->Legacy.Length); + ok(xctx->All.Offset == -(int)sizeof(CONTEXT), "Got unexpected All.Offset %d.\n", xctx->All.Offset); + ok(xctx->All.Length == sizeof(CONTEXT) + xctx->XState.Offset + xctx->XState.Length, + "Got unexpected All.Offset %d.\n", xctx->All.Offset); + expected_min_offset = sizeof(void *) == 8 ? sizeof(CONTEXT_EX) + sizeof(EXCEPTION_RECORD) : sizeof(CONTEXT_EX); + ok(xctx->XState.Offset >= expected_min_offset, + "Got unexpected XState.Offset %d.\n", xctx->XState.Offset); + ok(xctx->XState.Length >= sizeof(XSTATE), "Got unexpected XState.Length %d.\n", xctx->XState.Length); + + xs = (XSTATE *)((char *)xctx + xctx->XState.Offset); + context_ymm_data = (unsigned int *)&xs->YmmContext; + ok(!((ULONG_PTR)xs % 64), "Got unexpected xs %p.\n", xs); + + ok((compaction && (xs->CompactionMask & (expected_compaction_mask | 3)) == expected_compaction_mask) + || (!compaction && !xs->CompactionMask), "Got unexpected CompactionMask %s, compaction %#x.\n", + wine_dbgstr_longlong(xs->CompactionMask), compaction); + + if (test_extended_context_modified_state) + { + ok((xs->Mask & 7) == 4, "Got unexpected Mask %s.\n", wine_dbgstr_longlong(xs->Mask)); + ok(!memcmp(context_ymm_data, test_extended_context_data + 4, sizeof(M128A)), + "Got unexpected context data.\n"); + } + else + { + ok(!xs->Mask, "Got unexpected Mask %s.\n", wine_dbgstr_longlong(xs->Mask)); + /* The save area has garbage in this case, the state should be restored to INIT_STATE + * without using these data. */ + memcpy(context_ymm_data, test_extended_context_spoil_data1 + 4, sizeof(M128A)); + } + +done: +#ifdef __GNUC__ + __asm__ volatile("vmovups %0,%%ymm0" : : "m"(test_extended_context_spoil_data2)); +#endif +#ifdef __x86_64__ + ++context->Rip; +#else + if (*(BYTE *)context->Eip == 0xcc) + ++context->Eip; +#endif + return ExceptionContinueExecution; +} + +static void test_extended_context(void) +{ + static BYTE except_code_set_ymm0[] = + { +#ifdef __x86_64__ + 0x48, +#endif + 0xb8, /* mov imm,%ax */ + 0x00, 0x00, 0x00, 0x00, +#ifdef __x86_64__ + 0x00, 0x00, 0x00, 0x00, +#endif + + 0xc5, 0xfc, 0x10, 0x00, /* vmovups (%ax),%ymm0 */ + 0xcc, /* int3 */ + 0xc5, 0xfc, 0x11, 0x00, /* vmovups %ymm0,(%ax) */ + 0xc3, /* ret */ + }; + static BYTE except_code_reset_ymm_state[] = + { +#ifdef __x86_64__ + 0x48, +#endif + 0xb8, /* mov imm,%ax */ + 0x00, 0x00, 0x00, 0x00, +#ifdef __x86_64__ + 0x00, 0x00, 0x00, 0x00, +#endif + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + + 0xc5, 0xf8, 0x77, /* vzeroupper */ + 0x0f, 0x57, 0xc0, /* xorps %xmm0,%xmm0 */ + 0xcc, /* int3 */ + 0xc5, 0xfc, 0x11, 0x00, /* vmovups %ymm0,(%ax) */ + 0xc3, /* ret */ + }; + unsigned int i, address_offset; + unsigned data[8]; + + address_offset = sizeof(void *) == 8 ? 2 : 1; + *(void **)(except_code_set_ymm0 + address_offset) = data; + *(void **)(except_code_reset_ymm_state + address_offset) = data; + + if (!pRtlGetEnabledExtendedFeatures || !(pRtlGetEnabledExtendedFeatures(~(ULONG64)0) & (1 << XSTATE_AVX))) + { + skip("AVX is not supported.\n"); + return; + } + + memset(data, 0xff, sizeof(data)); + test_extended_context_modified_state = FALSE; + run_exception_test(test_extended_context_handler, NULL, except_code_reset_ymm_state, + ARRAY_SIZE(except_code_reset_ymm_state), PAGE_EXECUTE_READ); + for (i = 0; i < 8; ++i) + { + /* Older Windows version do not reset AVX context to INIT_STATE on x86. */ + todo_wine_if(i >= 4) + ok(!data[i] || broken(i >= 4 && sizeof(void *) == 4 && data[i] == test_extended_context_spoil_data2[i]), + "Got unexpected data %#x, i %u.\n", data[i], i); + } + + memcpy(data, test_extended_context_data, sizeof(data)); + test_extended_context_modified_state = TRUE; + run_exception_test(test_extended_context_handler, NULL, except_code_set_ymm0, + ARRAY_SIZE(except_code_set_ymm0), PAGE_EXECUTE_READ); + + for (i = 0; i < 8; ++i) + todo_wine_if(i >= 4) + ok(data[i] == test_extended_context_data[i], "Got unexpected data %#x, i %u.\n", data[i], i); +} +#endif + START_TEST(exception) { HMODULE hntdll = GetModuleHandleA("ntdll.dll"); @@ -5462,6 +5619,7 @@ START_TEST(exception) X(NtResumeProcess); X(RtlGetUnloadEventTrace); X(RtlGetUnloadEventTraceEx); + X(RtlGetEnabledExtendedFeatures); #undef X pIsWow64Process = (void *)GetProcAddress(GetModuleHandleA("kernel32.dll"), "IsWow64Process"); @@ -5544,6 +5702,7 @@ START_TEST(exception) test_dpe_exceptions(); test_prot_fault(); test_kiuserexceptiondispatcher(); + test_extended_context(); #elif defined(__x86_64__) @@ -5582,6 +5741,7 @@ START_TEST(exception) test_dynamic_unwind(); else skip( "Dynamic unwind functions not found\n" ); + test_extended_context(); #endif test_debugger();

1 0

Paul Gofman : ntdll: Support AVX context in fault exceptions on Linux x86_64.
by Alexandre Julliard 21 Aug '20

21 Aug '20

Module: wine Branch: master Commit: 16ed88a95234d844fee9fc19053c5c7f618f92ba URL: https://source.winehq.org/git/wine.git/?a=commit;h=16ed88a95234d844fee9fc19… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Aug 21 02:42:12 2020 +0300 ntdll: Support AVX context in fault exceptions on Linux x86_64. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_x86_64.c | 2 + dlls/ntdll/tests/exception.c | 3 +- dlls/ntdll/unix/signal_x86_64.c | 114 +++++++++++++++++++++++++++++++++------- dlls/ntdll/unix/unix_private.h | 38 ++++++++++++++ 4 files changed, 136 insertions(+), 21 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=16ed88a95234d844fee9…

1 0

Paul Gofman : ntdll: Restore AVX registers in NtSetContextThread() on x86_64.
by Alexandre Julliard 21 Aug '20

21 Aug '20

Module: wine Branch: master Commit: 2c3719c7a9b370461d18c4422dd965dda80cb859 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2c3719c7a9b370461d18c442… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Aug 21 02:42:13 2020 +0300 ntdll: Restore AVX registers in NtSetContextThread() on x86_64. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/exception.c | 4 ++-- dlls/ntdll/unix/signal_x86_64.c | 30 ++++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 041a5f258d..f92491bb34 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -5562,7 +5562,7 @@ static void test_extended_context(void) for (i = 0; i < 8; ++i) { /* Older Windows version do not reset AVX context to INIT_STATE on x86. */ - todo_wine_if(i >= 4) + todo_wine_if(i >= 4 && sizeof(void *) == 4) ok(!data[i] || broken(i >= 4 && sizeof(void *) == 4 && data[i] == test_extended_context_spoil_data2[i]), "Got unexpected data %#x, i %u.\n", data[i], i); } @@ -5573,7 +5573,7 @@ static void test_extended_context(void) ARRAY_SIZE(except_code_set_ymm0), PAGE_EXECUTE_READ); for (i = 0; i < 8; ++i) - todo_wine_if(i >= 4) + todo_wine_if(i >= 4 && sizeof(void *) == 4) ok(data[i] == test_extended_context_data[i], "Got unexpected data %#x, i %u.\n", data[i], i); } #endif diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index a98dc8657d..7c13b4f7d2 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -1535,6 +1535,34 @@ __ASM_GLOBAL_FUNC( set_full_cpu_context, "iretq" ); +/*********************************************************************** + * restore_xstate + * + * Restore the XState context. + */ +static void restore_xstate( const CONTEXT *context ) +{ + XSAVE_FORMAT *xrstor_base; + XSTATE *xs; + + if (!(xs = xstate_from_context( context ))) + return; + + xrstor_base = (XSAVE_FORMAT *)xs - 1; + + if (!(xs->CompactionMask & ((ULONG64)1 << 63))) + { + /* Non-compacted xrstor will load Mxcsr regardless of the specified mask. Loading garbage there + * may lead to fault. We have only padding, no more used EXCEPTION_RECORD or unused context fields + * at the MxCsr restore location, so just put it there. */ + assert( (void *)&xrstor_base->MxCsr > (void *)context->VectorRegister ); + xrstor_base->MxCsr = context->u.FltSave.MxCsr; + xrstor_base->MxCsr_Mask = context->u.FltSave.MxCsr_Mask; + } + + __asm__ volatile( "xrstor64 %0" : : "m"(*xrstor_base), "a" (4), "d" (0) ); +} + /*********************************************************************** * get_server_context_flags * @@ -1725,6 +1753,8 @@ NTSTATUS WINAPI NtSetContextThread( HANDLE handle, const CONTEXT *context ) } } + restore_xstate( context ); + if (flags & CONTEXT_FULL) { if (!(flags & CONTEXT_CONTROL))

1 0

Paul Gofman : ntdll: Support AVX context in fault exceptions on Linux i386.
by Alexandre Julliard 21 Aug '20

21 Aug '20

Module: wine Branch: master Commit: 9aa885bf37c01df1e8f00852681806ec4c21b040 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9aa885bf37c01df1e8f00852… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Aug 21 02:42:14 2020 +0300 ntdll: Support AVX context in fault exceptions on Linux i386. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/exception.c | 2 +- dlls/ntdll/unix/signal_i386.c | 146 ++++++++++++++++++++++++++++++------------ 2 files changed, 106 insertions(+), 42 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9aa885bf37c01df1e8f0…

1 0

Paul Gofman : ntdll: Restore AVX registers in NtSetContextThread() on i386.
by Alexandre Julliard 21 Aug '20

21 Aug '20

Module: wine Branch: master Commit: 601175822e9c61ce02e21f20c76daf1b760d6924 URL: https://source.winehq.org/git/wine.git/?a=commit;h=601175822e9c61ce02e21f20… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Aug 21 02:42:15 2020 +0300 ntdll: Restore AVX registers in NtSetContextThread() on i386. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/exception.c | 2 -- dlls/ntdll/unix/signal_i386.c | 38 ++++++++++++++++++++++++++++++++++++-- 2 files changed, 36 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index aff18e3439..e75336ed11 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -5562,7 +5562,6 @@ static void test_extended_context(void) for (i = 0; i < 8; ++i) { /* Older Windows version do not reset AVX context to INIT_STATE on x86. */ - todo_wine_if(i >= 4 && sizeof(void *) == 4) ok(!data[i] || broken(i >= 4 && sizeof(void *) == 4 && data[i] == test_extended_context_spoil_data2[i]), "Got unexpected data %#x, i %u.\n", data[i], i); } @@ -5573,7 +5572,6 @@ static void test_extended_context(void) ARRAY_SIZE(except_code_set_ymm0), PAGE_EXECUTE_READ); for (i = 0; i < 8; ++i) - todo_wine_if(i >= 4 && sizeof(void *) == 4) ok(data[i] == test_extended_context_data[i], "Got unexpected data %#x, i %u.\n", data[i], i); } #endif diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c index 791ffe9094..6a27277bc2 100644 --- a/dlls/ntdll/unix/signal_i386.c +++ b/dlls/ntdll/unix/signal_i386.c @@ -687,7 +687,7 @@ static inline void save_fpux( CONTEXT *context ) /*********************************************************************** * restore_fpu * - * Restore the FPU context to a sigcontext. + * Restore the x87 FPU context */ static inline void restore_fpu( const CONTEXT *context ) { @@ -701,7 +701,7 @@ static inline void restore_fpu( const CONTEXT *context ) /*********************************************************************** * restore_fpux * - * Restore the FPU extended context to a sigcontext. + * Restore the FPU extended context */ static inline void restore_fpux( const CONTEXT *context ) { @@ -715,6 +715,38 @@ static inline void restore_fpux( const CONTEXT *context ) __asm__ __volatile__( "fxrstor %0" : : "m" (*state) ); } +/*********************************************************************** + * restore_xstate + * + * Restore the XState context + */ +static inline void restore_xstate( const CONTEXT *context ) +{ + XSAVE_FORMAT *xrstor_base; + XSTATE *xs; + + if (!(xs = xstate_from_context( context ))) + return; + + xrstor_base = (XSAVE_FORMAT *)xs - 1; + + if (!(xs->CompactionMask & ((ULONG64)1 << 63))) + { + /* Non-compacted xrstor will load Mxcsr regardless of the specified mask. Loading garbage there + * may lead to fault. FPUX state should be restored by now, so we can reuse some space in + * ExtendedRegisters. */ + XSAVE_FORMAT *fpux = (XSAVE_FORMAT *)context->ExtendedRegisters; + DWORD mxcsr, mxcsr_mask; + + mxcsr = fpux->MxCsr; + mxcsr_mask = fpux->MxCsr_Mask; + + assert( (void *)&xrstor_base->MxCsr > (void *)context->ExtendedRegisters ); + xrstor_base->MxCsr = mxcsr; + xrstor_base->MxCsr_Mask = mxcsr_mask; + } + __asm__ volatile( "xrstor %0" : : "m"(*xrstor_base), "a" (4), "d" (0) ); +} /*********************************************************************** * fpux_to_fpu @@ -1129,6 +1161,8 @@ NTSTATUS WINAPI NtSetContextThread( HANDLE handle, const CONTEXT *context ) if (flags & CONTEXT_EXTENDED_REGISTERS) restore_fpux( context ); else if (flags & CONTEXT_FLOATING_POINT) restore_fpu( context ); + restore_xstate( context ); + if (flags & CONTEXT_FULL) { if (!(flags & CONTEXT_CONTROL))

1 0

Piotr Caban : msvcrt: Optimize memmove implementation.
by Alexandre Julliard 21 Aug '20

21 Aug '20

Module: wine Branch: master Commit: dd90fdda0e8b8f4b0c669d637193ffdddd1de820 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dd90fdda0e8b8f4b0c669d63… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Aug 20 20:00:42 2020 +0200 msvcrt: Optimize memmove implementation. Based on Torbjorn Granlund code from Glibc. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49663 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/string.c | 91 +++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 87 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index ab6747db5c..3343f1e3cc 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -2483,23 +2483,106 @@ int __cdecl MSVCRT_memcmp(const void *ptr1, const void *ptr2, MSVCRT_size_t n) /********************************************************************* * memmove (MSVCRT.@) */ +#ifdef WORDS_BIGENDIAN +# define MERGE(w1, sh1, w2, sh2) ((w1 << sh1) | (w2 >> sh2)) +#else +# define MERGE(w1, sh1, w2, sh2) ((w1 >> sh1) | (w2 << sh2)) +#endif void * __cdecl MSVCRT_memmove(void *dst, const void *src, MSVCRT_size_t n) { - volatile unsigned char *d = dst; /* avoid gcc optimizations */ + unsigned char *d = dst; const unsigned char *s = src; + int sh1; + + if (!n) return dst; if ((MSVCRT_size_t)dst - (MSVCRT_size_t)src >= n) { + for (; (MSVCRT_size_t)d % sizeof(MSVCRT_size_t) && n; n--) *d++ = *s++; + + sh1 = 8 * ((MSVCRT_size_t)s % sizeof(MSVCRT_size_t)); + if (!sh1) + { + while (n >= sizeof(MSVCRT_size_t)) + { + *(MSVCRT_size_t*)d = *(MSVCRT_size_t*)s; + s += sizeof(MSVCRT_size_t); + d += sizeof(MSVCRT_size_t); + n -= sizeof(MSVCRT_size_t); + } + } + else if (n >= 2 * sizeof(MSVCRT_size_t)) + { + int sh2 = 8 * sizeof(MSVCRT_size_t) - sh1; + MSVCRT_size_t x, y; + + s -= sh1 / 8; + x = *(MSVCRT_size_t*)s; + do + { + s += sizeof(MSVCRT_size_t); + y = *(MSVCRT_size_t*)s; + *(MSVCRT_size_t*)d = MERGE(x, sh1, y, sh2); + d += sizeof(MSVCRT_size_t); + + s += sizeof(MSVCRT_size_t); + x = *(MSVCRT_size_t*)s; + *(MSVCRT_size_t*)d = MERGE(y, sh1, x, sh2); + d += sizeof(MSVCRT_size_t); + + n -= 2 * sizeof(MSVCRT_size_t); + } while (n >= 2 * sizeof(MSVCRT_size_t)); + s += sh1 / 8; + } while (n--) *d++ = *s++; + return dst; } else { - d += n - 1; - s += n - 1; - while (n--) *d-- = *s--; + d += n; + s += n; + + for (; (MSVCRT_size_t)d % sizeof(MSVCRT_size_t) && n; n--) *--d = *--s; + + sh1 = 8 * ((MSVCRT_size_t)s % sizeof(MSVCRT_size_t)); + if (!sh1) + { + while (n >= sizeof(MSVCRT_size_t)) + { + s -= sizeof(MSVCRT_size_t); + d -= sizeof(MSVCRT_size_t); + *(MSVCRT_size_t*)d = *(MSVCRT_size_t*)s; + n -= sizeof(MSVCRT_size_t); + } + } + else if (n >= 2 * sizeof(MSVCRT_size_t)) + { + int sh2 = 8 * sizeof(MSVCRT_size_t) - sh1; + MSVCRT_size_t x, y; + + s -= sh1 / 8; + x = *(MSVCRT_size_t*)s; + do + { + s -= sizeof(MSVCRT_size_t); + y = *(MSVCRT_size_t*)s; + d -= sizeof(MSVCRT_size_t); + *(MSVCRT_size_t*)d = MERGE(y, sh1, x, sh2); + + s -= sizeof(MSVCRT_size_t); + x = *(MSVCRT_size_t*)s; + d -= sizeof(MSVCRT_size_t); + *(MSVCRT_size_t*)d = MERGE(x, sh1, y, sh2); + + n -= 2 * sizeof(MSVCRT_size_t); + } while (n >= 2 * sizeof(MSVCRT_size_t)); + s += sh1 / 8; + } + while (n--) *--d = *--s; } return dst; } +#undef MERGE /********************************************************************* * memcpy (MSVCRT.@)

1 0

Alex Henrie : urlmon/tests: Work around broken Win10 in test_CoInternetCombineUrlEx.
by Alexandre Julliard 21 Aug '20

21 Aug '20

Module: wine Branch: master Commit: bcfd32edad0812e26dcf3ac6d17a43dfe1ca3ce5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bcfd32edad0812e26dcf3ac6… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Aug 19 21:54:12 2020 -0600 urlmon/tests: Work around broken Win10 in test_CoInternetCombineUrlEx. The exact same workaround was already being used in test_CoInternetCombineIUri. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/urlmon/tests/uri.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index b1390a35bf..b6d2182a27 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -10899,10 +10899,11 @@ static void test_CoInternetCombineUrlEx(void) { hr = pCoInternetCombineUrlEx(base, relativeW, uri_combine_tests[i].combine_flags, &result, 0); todo_wine_if(uri_combine_tests[i].todo) - ok(hr == uri_combine_tests[i].expected, + ok(hr == uri_combine_tests[i].expected || + broken(hr == S_OK && uri_combine_tests[i].expected == E_INVALIDARG) /* win10 1607 to 1709 */, "Error: CoInternetCombineUrlEx returned 0x%08x, expected 0x%08x on uri_combine_tests[%d].\n", hr, uri_combine_tests[i]. expected, i); - if(SUCCEEDED(hr)) { + if(SUCCEEDED(hr) && SUCCEEDED(uri_combine_tests[i].expected)) { DWORD j; for(j = 0; j < ARRAY_SIZE(uri_combine_tests[i].str_props); ++j) {

1 0

Nikolay Sivov : combase: Move CoGetCurrentProcess().
by Alexandre Julliard 21 Aug '20

21 Aug '20

Module: wine Branch: master Commit: a1ff0d9b78fcfa6130b90d6b822c170e6d1d4980 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a1ff0d9b78fcfa6130b90d6b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Aug 21 11:37:20 2020 +0300 combase: Move CoGetCurrentProcess(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/combase/Makefile.in | 4 + dlls/combase/combase.c | 16 ++++ dlls/combase/combase.spec | 2 +- dlls/combase/combase_private.h | 3 + dlls/{ole32 => combase}/irpcss.idl | 0 dlls/combase/rpc.c | 155 +++++++++++++++++++++++++++++++++++++ dlls/ole32/Makefile.in | 1 - dlls/ole32/compobj.c | 16 ---- dlls/ole32/compobj_private.h | 2 - dlls/ole32/moniker.c | 44 ----------- dlls/ole32/ole32.spec | 2 +- 11 files changed, 180 insertions(+), 65 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a1ff0d9b78fcfa6130b9…

1 0