March 2021 - Wine-Commits - list.winehq.org

Jacek Caban : ntdll: Use syscall frame for FPU and XMM contexts in NtGetContextThread.
by Alexandre Julliard March 1, 2021

March 1, 2021

Module: wine Branch: master Commit: e5d671bee5dc78235c5c9942b4cb43853d0f045c URL: https://source.winehq.org/git/wine.git/?a=commit;h=e5d671bee5dc78235c5c9942… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 1 16:51:48 2021 +0100 ntdll: Use syscall frame for FPU and XMM contexts in NtGetContextThread. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_i386.c | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c index 7e383bdcaba..cec2a89c7bf 100644 --- a/dlls/ntdll/unix/signal_i386.c +++ b/dlls/ntdll/unix/signal_i386.c @@ -530,6 +530,11 @@ void set_syscall_frame(void *frame) x86_thread_data()->syscall_frame = frame; } +static struct syscall_xsave *get_syscall_xsave( struct syscall_frame *frame ) +{ + return (struct syscall_xsave *)((ULONG_PTR)((struct syscall_xsave *)frame - 1) & ~63); +} + static inline WORD get_cs(void) { WORD res; __asm__( "movw %%cs,%0" : "=r" (res) ); return res; } static inline WORD get_ds(void) { WORD res; __asm__( "movw %%ds,%0" : "=r" (res) ); return res; } static inline WORD get_fs(void) { WORD res; __asm__( "movw %%fs,%0" : "=r" (res) ); return res; } @@ -701,23 +706,6 @@ static inline void save_fpu( CONTEXT *context ) } -/*********************************************************************** - * save_fpux - * - * Save the thread FPU extended context. - */ -static inline void save_fpux( CONTEXT *context ) -{ - /* we have to enforce alignment by hand */ - char buffer[sizeof(XSAVE_FORMAT) + 16]; - XSAVE_FORMAT *state = (XSAVE_FORMAT *)(((ULONG_PTR)buffer + 15) & ~15); - - context->ContextFlags |= CONTEXT_EXTENDED_REGISTERS; - __asm__ __volatile__( "fxsave %0" : "=m" (*state) ); - memcpy( context->ExtendedRegisters, state, sizeof(*state) ); -} - - /*********************************************************************** * save_xstate * @@ -1328,6 +1316,7 @@ NTSTATUS WINAPI NtGetContextThread( HANDLE handle, CONTEXT *context ) if (self) { + struct syscall_xsave *xsave = get_syscall_xsave( frame ); if (needed_flags & CONTEXT_INTEGER) { context->Eax = frame->eax; @@ -1356,8 +1345,19 @@ NTSTATUS WINAPI NtGetContextThread( HANDLE handle, CONTEXT *context ) context->SegGs = frame->gs; context->ContextFlags |= CONTEXT_SEGMENTS; } - if (needed_flags & CONTEXT_FLOATING_POINT) save_fpu( context ); - if (needed_flags & CONTEXT_EXTENDED_REGISTERS) save_fpux( context ); + if (needed_flags & CONTEXT_FLOATING_POINT) + { + if (cpu_info.FeatureSet & CPU_FEATURE_FXSR) + fpux_to_fpu( &context->FloatSave, &xsave->u.xsave ); + else + context->FloatSave = xsave->u.fsave; + context->ContextFlags |= CONTEXT_FLOATING_POINT; + } + if (needed_flags & CONTEXT_EXTENDED_REGISTERS) + { + memcpy( context->ExtendedRegisters, &xsave->u.xsave, sizeof(xsave->u.xsave) ); + context->ContextFlags |= CONTEXT_EXTENDED_REGISTERS; + } /* update the cached version of the debug registers */ if (context->ContextFlags & (CONTEXT_DEBUG_REGISTERS & ~CONTEXT_i386)) {

1 0

Zebediah Figura : wow64cpu: Add stub dll.
by Alexandre Julliard March 1, 2021

March 1, 2021

Module: wine Branch: master Commit: b4fddcabdb0328cd21aa87af45bc6504b9687ecb URL: https://source.winehq.org/git/wine.git/?a=commit;h=b4fddcabdb0328cd21aa87af… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Feb 25 21:38:30 2021 -0600 wow64cpu: Add stub dll. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 4 ++++ configure.ac | 3 +++ dlls/wow64cpu/Makefile.in | 1 + dlls/wow64cpu/wow64cpu.spec | 9 +++++++++ 4 files changed, 17 insertions(+) diff --git a/configure b/configure index d21dccbcce7..2b20133cd65 100755 --- a/configure +++ b/configure @@ -1700,6 +1700,7 @@ enable_wmp enable_wmphoto enable_wmvcore enable_wnaspi32 +enable_wow64cpu enable_wpc enable_wpcap enable_ws2_32 @@ -5724,6 +5725,7 @@ $as_echo "$wine_cv_builtin_ms_va_list" >&6; } host_cpu="x86_64" notice_platform="64-bit " TARGETFLAGS="-m64" + enable_wow64cpu=${enable_wow64cpu:-yes} fi ;; arm*) @@ -5846,6 +5848,7 @@ esac enable_win16=${enable_win16:-no} enable_win64=${enable_win64:-no} +enable_wow64cpu=${enable_wow64cpu:-no} enable_winetest=${enable_winetest:-$enable_tests} @@ -21123,6 +21126,7 @@ wine_fn_config_makefile dlls/wmvcore enable_wmvcore wine_fn_config_makefile dlls/wmvcore/tests enable_tests wine_fn_config_makefile dlls/wnaspi32 enable_wnaspi32 wine_fn_config_makefile dlls/wow32 enable_win16 +wine_fn_config_makefile dlls/wow64cpu enable_wow64cpu wine_fn_config_makefile dlls/wpc enable_wpc wine_fn_config_makefile dlls/wpc/tests enable_tests wine_fn_config_makefile dlls/wpcap enable_wpcap diff --git a/configure.ac b/configure.ac index caff5d1fe52..24f5c8847d6 100644 --- a/configure.ac +++ b/configure.ac @@ -170,6 +170,7 @@ case $host in host_cpu="x86_64" notice_platform="64-bit " TARGETFLAGS="-m64" + enable_wow64cpu=${enable_wow64cpu:-yes} fi ;; arm*) @@ -224,6 +225,7 @@ esac dnl enable_win16 defaults to yes on x86, to no on other CPUs enable_win16=${enable_win16:-no} enable_win64=${enable_win64:-no} +enable_wow64cpu=${enable_wow64cpu:-no} dnl Disable winetest too if tests are disabled enable_winetest=${enable_winetest:-$enable_tests} @@ -3857,6 +3859,7 @@ WINE_CONFIG_MAKEFILE(dlls/wmvcore) WINE_CONFIG_MAKEFILE(dlls/wmvcore/tests) WINE_CONFIG_MAKEFILE(dlls/wnaspi32) WINE_CONFIG_MAKEFILE(dlls/wow32,enable_win16) +WINE_CONFIG_MAKEFILE(dlls/wow64cpu) WINE_CONFIG_MAKEFILE(dlls/wpc) WINE_CONFIG_MAKEFILE(dlls/wpc/tests) WINE_CONFIG_MAKEFILE(dlls/wpcap) diff --git a/dlls/wow64cpu/Makefile.in b/dlls/wow64cpu/Makefile.in new file mode 100644 index 00000000000..261363fa72a --- /dev/null +++ b/dlls/wow64cpu/Makefile.in @@ -0,0 +1 @@ +MODULE = wow64cpu.dll diff --git a/dlls/wow64cpu/wow64cpu.spec b/dlls/wow64cpu/wow64cpu.spec new file mode 100644 index 00000000000..768b6627a1d --- /dev/null +++ b/dlls/wow64cpu/wow64cpu.spec @@ -0,0 +1,9 @@ +@ stub BTCpuGetBopCode +@ stub BTCpuGetContext +@ stub BTCpuProcessInit +@ stub BTCpuResetToConsistentState +@ stub BTCpuSetContext +@ stub BTCpuSimulate +@ stub BTCpuTurboThunkControl +@ stub TurboDispatchJumpAddressEnd +@ stub TurboDispatchJumpAddressStart

1 0

Hugh McMaster : reg/tests: Split 'export' tests from reg.c.
by Alexandre Julliard March 1, 2021

March 1, 2021

Module: wine Branch: master Commit: 60701b02981980dbd821b59f46c102b6f80a79cb URL: https://source.winehq.org/git/wine.git/?a=commit;h=60701b02981980dbd821b59f… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Mar 1 14:16:51 2021 +1100 reg/tests: Split 'export' tests from reg.c. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/Makefile.in | 1 + programs/reg/tests/export.c | 416 +++++++++++++++++++++++++++++++++++++++++ programs/reg/tests/reg.c | 383 ------------------------------------- 3 files changed, 417 insertions(+), 383 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=60701b02981980dbd821…

1 0

Hugh McMaster : reg/tests: Split 'copy' tests from reg.c.
by Alexandre Julliard March 1, 2021

March 1, 2021

Module: wine Branch: master Commit: cc4cc7086faf087590d22b9b58b6c45386e181c8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cc4cc7086faf087590d22b9b… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Mar 1 14:16:52 2021 +1100 reg/tests: Split 'copy' tests from reg.c. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/Makefile.in | 1 + programs/reg/tests/copy.c | 110 +++++++++++++++++++++++++++++++++++++++++ programs/reg/tests/reg.c | 80 ------------------------------ 3 files changed, 111 insertions(+), 80 deletions(-) diff --git a/programs/reg/tests/Makefile.in b/programs/reg/tests/Makefile.in index 6f0f9ce7c5c..7458e32348c 100644 --- a/programs/reg/tests/Makefile.in +++ b/programs/reg/tests/Makefile.in @@ -2,6 +2,7 @@ TESTDLL = reg.exe IMPORTS = advapi32 C_SRCS = \ + copy.c \ delete.c \ export.c \ import.c \ diff --git a/programs/reg/tests/copy.c b/programs/reg/tests/copy.c new file mode 100644 index 00000000000..b91352c9d46 --- /dev/null +++ b/programs/reg/tests/copy.c @@ -0,0 +1,110 @@ +/* + * Copyright 2021 Hugh McMaster + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "reg_test.h" + +#define COPY_DEST KEY_WINE "\\reg_copy" + +static void test_copy(void) +{ + DWORD r; + + delete_tree(HKEY_CURRENT_USER, KEY_BASE); + verify_key_nonexist(HKEY_CURRENT_USER, KEY_BASE); + + run_reg_exe("reg copy", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg copy /?", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + + run_reg_exe("reg copy /h", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + + run_reg_exe("reg copy -H", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + + run_reg_exe("reg copy /? /f", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg copy /h /f", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg copy /? /s", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg copy /h /s", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg copy /f", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg copy /s", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg copy /s /f", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg copy /f /s", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg copy HKEY_CURRENT_USER\\" KEY_BASE " /f", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg copy HKEY_CURRENT_USER\\" KEY_BASE " foo /f", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg copy /f HKEY_CURRENT_USER\\" KEY_BASE " HKEY_CURRENT_USER\\" KEY_BASE, &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg copy /f HKEY_CURRENT_USER\\" KEY_BASE " HKEY_CURRENT_USER\\" COPY_DEST, &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg copy HKEY_CURRENT_USER\\" KEY_BASE " /f HKEY_CURRENT_USER\\" COPY_DEST, &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg copy HKEY_CURRENT_USER\\" KEY_BASE " /s HKEY_CURRENT_USER\\" COPY_DEST, &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg copy HKEY_CURRENT_USER\\" KEY_BASE " HKEY_CURRENT_USER\\" COPY_DEST " /a", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg copy HKEY_CURRENT_USER\\" KEY_BASE " HKEY_CURRENT_USER\\" COPY_DEST " /f /a", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg copy HKEY_CURRENT_USER\\" KEY_BASE " HKEY_CURRENT_USER\\" KEY_BASE, &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg copy HKEY_CURRENT_USER\\" KEY_BASE " HKEY_CURRENT_USER\\" KEY_BASE " /f", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg copy HKEY_CURRENT_USER\\" KEY_BASE " HKEY_CURRENT_USER\\" KEY_BASE " /s /f", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); +} + +START_TEST(copy) +{ + DWORD r; + + if (!run_reg_exe("reg.exe /?", &r)) { + win_skip("reg.exe not available, skipping reg.exe tests\n"); + return; + } + + test_copy(); +} diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index d8a281548a5..d1af7831f4d 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -613,85 +613,6 @@ static void test_add(void) delete_tree(HKEY_CURRENT_USER, KEY_BASE); } -#define COPY_DEST KEY_WINE "\\reg_copy" - -static void test_copy(void) -{ - DWORD r; - - delete_tree(HKEY_CURRENT_USER, KEY_BASE); - verify_key_nonexist(HKEY_CURRENT_USER, KEY_BASE); - - run_reg_exe("reg copy", &r); - ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); - - run_reg_exe("reg copy /?", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - - run_reg_exe("reg copy /h", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - - run_reg_exe("reg copy -H", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - - run_reg_exe("reg copy /? /f", &r); - ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); - - run_reg_exe("reg copy /h /f", &r); - ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); - - run_reg_exe("reg copy /? /s", &r); - ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); - - run_reg_exe("reg copy /h /s", &r); - ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); - - run_reg_exe("reg copy /f", &r); - ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); - - run_reg_exe("reg copy /s", &r); - ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); - - run_reg_exe("reg copy /s /f", &r); - ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); - - run_reg_exe("reg copy /f /s", &r); - ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); - - run_reg_exe("reg copy HKEY_CURRENT_USER\\" KEY_BASE " /f", &r); - ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); - - run_reg_exe("reg copy HKEY_CURRENT_USER\\" KEY_BASE " foo /f", &r); - ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); - - run_reg_exe("reg copy HKEY_CURRENT_USER\\" KEY_BASE " HKEY_CURRENT_USER\\" KEY_BASE" /f", &r); - ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); - - run_reg_exe("reg copy /f HKEY_CURRENT_USER\\" KEY_BASE " HKEY_CURRENT_USER\\" KEY_BASE, &r); - ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); - - run_reg_exe("reg copy /f HKEY_CURRENT_USER\\" KEY_BASE " HKEY_CURRENT_USER\\" COPY_DEST, &r); - ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); - - run_reg_exe("reg copy HKEY_CURRENT_USER\\" KEY_BASE " /f HKEY_CURRENT_USER\\" COPY_DEST, &r); - ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); - - run_reg_exe("reg copy HKEY_CURRENT_USER\\" KEY_BASE " /s HKEY_CURRENT_USER\\" COPY_DEST, &r); - ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); - - run_reg_exe("reg copy HKEY_CURRENT_USER\\" COPY_DEST " HKEY_CURRENT_USER\\" KEY_BASE, &r); - ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); - - run_reg_exe("reg copy HKEY_CURRENT_USER\\" COPY_DEST " HKEY_CURRENT_USER\\" KEY_BASE, &r); - ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); - - run_reg_exe("reg copy HKEY_CURRENT_USER\\" KEY_BASE " HKEY_CURRENT_USER\\" COPY_DEST "/a", &r); - ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); - - run_reg_exe("reg copy HKEY_CURRENT_USER\\" KEY_BASE " HKEY_CURRENT_USER\\" COPY_DEST "/f /a", &r); - ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); -} - START_TEST(reg) { DWORD r; @@ -702,5 +623,4 @@ START_TEST(reg) } test_add(); - test_copy(); }

1 0

Hugh McMaster : reg/tests: Split first sequence of Unicode 'import' tests from reg.c.
by Alexandre Julliard March 1, 2021

March 1, 2021

Module: wine Branch: master Commit: 2e33ab5559419655584716669505e7943613d3bb URL: https://source.winehq.org/git/wine.git/?a=commit;h=2e33ab555941965558471666… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Mar 1 14:16:48 2021 +1100 reg/tests: Split first sequence of Unicode 'import' tests from reg.c. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/import.c | 1550 ++++++++++++++++++++++++++++++++++++++++++ programs/reg/tests/reg.c | 1551 +------------------------------------------ 2 files changed, 1551 insertions(+), 1550 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2e33ab55594196555847…

1 0

Hugh McMaster : reg/tests: Split first sequence of 'import' tests from reg.c.
by Alexandre Julliard March 1, 2021

March 1, 2021

Module: wine Branch: master Commit: 58863f53316d2d88654d3a18c9481441dfabcb1a URL: https://source.winehq.org/git/wine.git/?a=commit;h=58863f53316d2d88654d3a18… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Mar 1 14:16:47 2021 +1100 reg/tests: Split first sequence of 'import' tests from reg.c. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/Makefile.in | 1 + programs/reg/tests/import.c | 1636 ++++++++++++++++++++++++++++++++++++++++ programs/reg/tests/reg.c | 1620 +-------------------------------------- programs/reg/tests/reg_test.h | 16 + 4 files changed, 1658 insertions(+), 1615 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=58863f53316d2d88654d…

1 0

Jacek Caban : ntdll: Use syscall frame for FPU and XMM contexts in NtSetContextThread.
by Alexandre Julliard March 1, 2021

March 1, 2021

Module: wine Branch: master Commit: 6e03330a2124dfcdd631d43672f5ead46ce9f334 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6e03330a2124dfcdd631d436… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 1 16:52:15 2021 +0100 ntdll: Use syscall frame for FPU and XMM contexts in NtSetContextThread. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_i386.c | 73 ++++++++++++++++++++++++++++++++----------- 1 file changed, 54 insertions(+), 19 deletions(-) diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c index cec2a89c7bf..cc1e1d24e2a 100644 --- a/dlls/ntdll/unix/signal_i386.c +++ b/dlls/ntdll/unix/signal_i386.c @@ -770,23 +770,6 @@ static inline void restore_fpu( const CONTEXT *context ) } -/*********************************************************************** - * restore_fpux - * - * Restore the FPU extended context - */ -static inline void restore_fpux( const CONTEXT *context ) -{ - /* we have to enforce alignment by hand */ - char buffer[sizeof(XSAVE_FORMAT) + 16]; - XSAVE_FORMAT *state = (XSAVE_FORMAT *)(((ULONG_PTR)buffer + 15) & ~15); - - memcpy( state, context->ExtendedRegisters, sizeof(*state) ); - /* reset the current interrupt status */ - state->StatusWord &= state->ControlWord | 0xff80; - __asm__ __volatile__( "fxrstor %0" : : "m" (*state) ); -} - /*********************************************************************** * restore_xstate * @@ -867,6 +850,32 @@ static void fpux_to_fpu( FLOATING_SAVE_AREA *fpu, const XSAVE_FORMAT *fpux ) } +/*********************************************************************** + * fpu_to_fpux + * + * Fill extended FPU context from standard one. + */ +static void fpu_to_fpux( XSAVE_FORMAT *fpux, const FLOATING_SAVE_AREA *fpu ) +{ + unsigned int i; + + fpux->ControlWord = fpu->ControlWord; + fpux->StatusWord = fpu->StatusWord; + fpux->ErrorOffset = fpu->ErrorOffset; + fpux->ErrorSelector = fpu->ErrorSelector; + fpux->ErrorOpcode = fpu->ErrorSelector >> 16; + fpux->DataOffset = fpu->DataOffset; + fpux->DataSelector = fpu->DataSelector; + fpux->TagWord = 0; + for (i = 0; i < 8; i++) + { + if (((fpu->TagWord >> (i * 2)) & 3) != 3) + fpux->TagWord |= 1 << i; + memcpy( &fpux->FloatRegisters[i], &fpu->RegisterArea[10 * i], 10 ); + } +} + + /*********************************************************************** * save_context * @@ -1041,6 +1050,16 @@ __ASM_GLOBAL_FUNC( set_full_cpu_context, */ void signal_restore_full_cpu_context(void) { + struct syscall_xsave *xsave = get_syscall_xsave( get_syscall_frame() ); + + if (cpu_info.FeatureSet & CPU_FEATURE_FXSR) + { + __asm__ volatile( "fxrstor %0" : : "m"(xsave->u.xsave) ); + } + else + { + __asm__ volatile( "frstor %0; fwait" : : "m" (xsave->u.fsave) ); + } set_full_cpu_context(); } @@ -1272,8 +1291,24 @@ NTSTATUS WINAPI NtSetContextThread( HANDLE handle, const CONTEXT *context ) frame->fs = context->SegFs; frame->gs = context->SegGs; } - if (flags & CONTEXT_EXTENDED_REGISTERS) restore_fpux( context ); - else if (flags & CONTEXT_FLOATING_POINT) restore_fpu( context ); + if (flags & CONTEXT_EXTENDED_REGISTERS) + { + struct syscall_xsave *xsave = get_syscall_xsave( frame ); + memcpy( &xsave->u.xsave, context->ExtendedRegisters, sizeof(xsave->u.xsave) ); + /* reset the current interrupt status */ + xsave->u.xsave.StatusWord &= xsave->u.xsave.ControlWord | 0xff80; + } + else if (flags & CONTEXT_FLOATING_POINT) + { + if (cpu_info.FeatureSet & CPU_FEATURE_FXSR) + { + fpu_to_fpux( &get_syscall_xsave( frame )->u.xsave, &context->FloatSave ); + } + else + { + get_syscall_xsave( frame )->u.fsave = context->FloatSave; + } + } restore_xstate( context );

1 0

Jacek Caban : ntdll: Store FPU and XMM contexts in x86 syscall frame.
by Alexandre Julliard March 1, 2021

March 1, 2021

Module: wine Branch: master Commit: ce5f17c89237460ac5063b81a45caff70927f276 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ce5f17c89237460ac5063b81… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 1 16:51:32 2021 +0100 ntdll: Store FPU and XMM contexts in x86 syscall frame. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_arm.c | 1 + dlls/ntdll/unix/signal_i386.c | 23 ++++++++++++++++++++++- dlls/ntdll/unix/virtual.c | 1 - tools/winebuild/import.c | 28 +++++++++++++++++++++++++++- 4 files changed, 50 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/unix/signal_arm.c b/dlls/ntdll/unix/signal_arm.c index cb4695939f5..5c96521e55e 100644 --- a/dlls/ntdll/unix/signal_arm.c +++ b/dlls/ntdll/unix/signal_arm.c @@ -918,6 +918,7 @@ void signal_init_threading(void) */ NTSTATUS signal_alloc_thread( TEB *teb ) { + teb->WOW32Reserved = __wine_syscall_dispatcher; return STATUS_SUCCESS; } diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c index 0234c7aa6f7..7e383bdcaba 100644 --- a/dlls/ntdll/unix/signal_i386.c +++ b/dlls/ntdll/unix/signal_i386.c @@ -461,6 +461,17 @@ enum i386_trap_code #endif }; +struct syscall_xsave +{ + union + { + XSAVE_FORMAT xsave; + FLOATING_SAVE_AREA fsave; + } u; +}; + +C_ASSERT( sizeof(struct syscall_xsave) == 0x200 ); + struct syscall_frame { DWORD eflags; /* 00 */ @@ -502,6 +513,8 @@ C_ASSERT( offsetof( TEB, GdiTebBatch ) + offsetof( struct x86_thread_data, gs ) C_ASSERT( offsetof( TEB, GdiTebBatch ) + offsetof( struct x86_thread_data, exit_frame ) == 0x1f4 ); C_ASSERT( offsetof( TEB, GdiTebBatch ) + offsetof( struct x86_thread_data, syscall_frame ) == 0x1f8 ); +static void *syscall_dispatcher; + static inline struct x86_thread_data *x86_thread_data(void) { return (struct x86_thread_data *)ntdll_get_thread_data()->cpu_data; @@ -2424,6 +2437,7 @@ NTSTATUS signal_alloc_thread( TEB *teb ) } else thread_data->fs = gdt_fs_sel; + teb->WOW32Reserved = syscall_dispatcher; return STATUS_SUCCESS; } @@ -2501,7 +2515,14 @@ void signal_init_process(void) */ void *signal_init_syscalls(void) { - return __wine_syscall_dispatcher; + extern void __wine_syscall_dispatcher_fxsave(void) DECLSPEC_HIDDEN; + + if (cpu_info.FeatureSet & CPU_FEATURE_FXSR) + syscall_dispatcher = __wine_syscall_dispatcher_fxsave; + else + syscall_dispatcher = __wine_syscall_dispatcher; + + return NtCurrentTeb()->WOW32Reserved = syscall_dispatcher; } diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 3350dc665c1..a707faae2a5 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -2556,7 +2556,6 @@ static void init_teb( TEB *teb, PEB *peb ) PtrToUlong( &teb64->ActivationContextStack.FrameListCache ); teb64->StaticUnicodeString.Buffer = PtrToUlong( teb64->StaticUnicodeBuffer ); teb64->StaticUnicodeString.MaximumLength = sizeof( teb64->StaticUnicodeBuffer ); - teb->WOW32Reserved = __wine_syscall_dispatcher; #endif teb->Peb = peb; teb->Tib.Self = &teb->Tib; diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index c760903dbd1..53d77a19e23 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -1456,7 +1456,19 @@ static void output_syscall_dispatcher( int count, const char *variant ) output( "\tmovl %%ecx,-0x28(%%ebp)\n" ); /* frame->esp */ output( "\tmovl 4(%%ebp),%%ecx\n" ); output( "\tmovl %%ecx,-0x2c(%%ebp)\n" ); /* frame->eip */ - output( "\tmovl %%esp,%%fs:0x1f8\n" ); /* x86_thread_data()->syscall_frame */ + output( "\tsubl $0x200,%%esp\n") ; + output( "\tandl $~63,%%esp\n" ); + if (!*variant) + { + output( "\tfnsave (%%esp)\n" ); + output( "\tfwait\n" ); + } + else + { + output( "\tfxsave (%%esp)\n" ); + } + output( "\tleal -0x30(%%ebp),%%ecx\n" ); + output( "\tmovl %%ecx,%%fs:0x1f8\n" ); /* x86_thread_data()->syscall_frame */ output( "\tcmpl $%u,%%eax\n", count ); output( "\tjae 4f\n" ); if (UsePIC) @@ -1479,6 +1491,17 @@ static void output_syscall_dispatcher( int count, const char *variant ) else output( "\tcall *.Lsyscall_table(,%%eax,4)\n" ); output( "2:\tmovl $0,%%fs:0x1f8\n" ); + output( "\tleal -0x230(%%ebp),%%ebx\n") ; + output( "\tandl $~63,%%ebx\n" ); + if (!*variant) + { + output( "\tfrstor (%%ebx)\n" ); + output( "\tfwait\n" ); + } + else + { + output( "\tfxrstor (%%ebx)\n" ); + } output( "\tleal -0x30(%%ebp),%%ebx\n" ); output_cfi( ".cfi_def_cfa_register %%ebx" ); output_cfi( ".cfi_adjust_cfa_offset 0x30\n" ); @@ -1792,6 +1815,9 @@ void output_syscalls( DLLSPEC *spec ) switch( target_cpu ) { + case CPU_x86: + output_syscall_dispatcher( count, "_fxsave" ); + break; case CPU_x86_64: output_syscall_dispatcher( count, "_xsave" ); output_syscall_dispatcher( count, "_xsavec" );

1 0

Jacek Caban : ntdll: Use syscall frame in x86 call_raise_user_exception_dispatcher implementation.
by Alexandre Julliard March 1, 2021

March 1, 2021

Module: wine Branch: master Commit: bbae70bf1e964ee6b30a7e63b0ff03585221d068 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bbae70bf1e964ee6b30a7e63… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 1 16:51:15 2021 +0100 ntdll: Use syscall frame in x86 call_raise_user_exception_dispatcher implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_i386.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c index 5e6d5fb25eb..0234c7aa6f7 100644 --- a/dlls/ntdll/unix/signal_i386.c +++ b/dlls/ntdll/unix/signal_i386.c @@ -1782,16 +1782,10 @@ __ASM_GLOBAL_FUNC( call_user_apc_dispatcher, /*********************************************************************** * call_raise_user_exception_dispatcher */ -__ASM_GLOBAL_FUNC( call_raise_user_exception_dispatcher, - "movl %fs:0x1f8,%eax\n\t" /* x86_thread_data()->syscall_frame */ - "movl 0x1c(%eax),%ebx\n\t" /* frame->ebx */ - "movl 0x28(%eax),%edi\n\t" /* frame->edi */ - "movl 0x2c(%eax),%esi\n\t" /* frame->esi */ - "movl 0x30(%eax),%ebp\n\t" /* frame->ebp */ - "movl 4(%esp),%edx\n\t" /* dispatcher */ - "movl $0,%fs:0x1f8\n\t" - "leal 0x38(%eax),%esp\n\t" - "jmp *%edx" ) +void WINAPI call_raise_user_exception_dispatcher( NTSTATUS (WINAPI *dispatcher)(void) ) +{ + x86_thread_data()->syscall_frame->eip = (DWORD)dispatcher; +} /***********************************************************************

1 0

Jacek Caban : ntdll: Restore all non-volatile i386 registers in syscall dispatcher.
by Alexandre Julliard March 1, 2021

March 1, 2021

Module: wine Branch: master Commit: e341d1f695311725752c287057f6c6ab60fdf2a3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e341d1f695311725752c2870… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 1 16:51:05 2021 +0100 ntdll: Restore all non-volatile i386 registers in syscall dispatcher. Based on set_full_cpu_context. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/import.c | 63 +++++++++++++++++++++++++++++++++++++----------- 1 file changed, 49 insertions(+), 14 deletions(-) diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index 720cf0589fd..c760903dbd1 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -1458,7 +1458,7 @@ static void output_syscall_dispatcher( int count, const char *variant ) output( "\tmovl %%ecx,-0x2c(%%ebp)\n" ); /* frame->eip */ output( "\tmovl %%esp,%%fs:0x1f8\n" ); /* x86_thread_data()->syscall_frame */ output( "\tcmpl $%u,%%eax\n", count ); - output( "\tjae 3f\n" ); + output( "\tjae 4f\n" ); if (UsePIC) { output( "\tmovl %%eax,%%edx\n" ); @@ -1479,19 +1479,54 @@ static void output_syscall_dispatcher( int count, const char *variant ) else output( "\tcall *.Lsyscall_table(,%%eax,4)\n" ); output( "2:\tmovl $0,%%fs:0x1f8\n" ); - output( "\tmovl -0x14(%%ebp),%%ebx\n" ); - output_cfi( ".cfi_same_value %%ebx\n" ); - output( "\tmovl -0x08(%%ebp),%%edi\n" ); - output_cfi( ".cfi_same_value %%edi\n" ); - output( "\tmovl -0x04(%%ebp),%%esi\n" ); - output_cfi( ".cfi_same_value %%esi\n" ); - output( "\tmovl %%ebp,%%esp\n" ); - output_cfi( ".cfi_def_cfa %%esp,8\n" ); - output( "\tpopl %%ebp\n" ); - output_cfi( ".cfi_adjust_cfa_offset -4\n" ); - output_cfi( ".cfi_same_value %%ebp\n" ); - output( "\tret\n" ); - output( "3:\tmovl $0x%x,%%eax\n", invalid_param ); + output( "\tleal -0x30(%%ebp),%%ebx\n" ); + output_cfi( ".cfi_def_cfa_register %%ebx" ); + output_cfi( ".cfi_adjust_cfa_offset 0x30\n" ); + output( "\tmovl %%eax,0x18(%%ebx)\n" ); + output( "\tmovw 0x16(%%ebx),%%gs\n" ); + output( "\tmovw 0x14(%%ebx),%%fs\n" ); + output( "\tmovw 0x12(%%ebx),%%es\n" ); + output( "\tmovl 0x28(%%ebx),%%edi\n" ); + output_cfi( ".cfi_same_value %%edi" ); + output( "\tmovl 0x2c(%%ebx),%%esi\n" ); + output_cfi( ".cfi_same_value %%esi" ); + output( "\tmovl (%%ebp),%%ebp\n" ); + output_cfi( ".cfi_same_value %%ebp" ); + output( "\tmovw %%ss,%%cx\n" ); + output( "\tcmpw 0x0e(%%ebx),%%cx\n" ); + output( "\tjne 3f\n" ); + /* As soon as we have switched stacks the context structure could + * be invalid (when signal handlers are executed for example). Copy + * values on the target stack before changing ESP. */ + output( "\tmovl 0x08(%%ebx),%%ecx\n" ); + output( "\tleal -3*4(%%ecx),%%ecx\n" ); + output( "\tmovl (%%ebx),%%edx\n" ); + output( "\tmovl %%edx,2*4(%%ecx)\n" ); + output( "\tmovl 0x0c(%%ebx),%%edx\n" ); + output( "\tmovl %%edx,1*4(%%ecx)\n" ); + output( "\tmovl 0x04(%%ebx),%%edx\n" ); + output( "\tmovl %%edx,0*4(%%ecx)\n" ); + output( "\tpushl 0x10(%%ebx)\n" ); + output( "\tmovl 0x1c(%%ebx),%%ebx\n" ); + output_cfi( ".cfi_same_value %%ebx" ); + output( "\tpopl %%ds\n" ); + output( "\tmovl %%ecx,%%esp\n" ); + output( "\tiret\n" ); + /* Restore the context when the stack segment changes. We can't use + * the same code as above because we do not know if the stack segment + * is 16 or 32 bit, and 'movl' will throw an exception when we try to + * access memory above the limit. */ + output( "\t3:\tmovl 0x18(%%ebx),%%ecx\n" ); + output( "\tmovw 0x0e(%%ebx),%%ss\n" ); + output( "\tmovl 0x08(%%ebx),%%esp\n" ); + output( "\tpushl 0x00(%%ebx)\n" ); + output( "\tpushl 0x0c(%%ebx)\n" ); + output( "\tpushl 0x04(%%ebx)\n" ); + output( "\tpushl 0x10(%%ebx)\n" ); + output( "\tmovl 0x1c(%%ebx),%%ebx\n" ); + output( "\tpopl %%ds\n" ); + output( "\tiret\n" ); + output( "4:\tmovl $0x%x,%%eax\n", invalid_param ); output( "\tjmp 2b\n" ); break; case CPU_x86_64:

1 0