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

Jacek Caban : ntdll: Use syscall frame in x86 call_raise_user_exception_dispatcher implementation.
by Alexandre Julliard 01 Mar '21

01 Mar '21

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: Store FPU and XMM contexts in x86 syscall frame.
by Alexandre Julliard 01 Mar '21

01 Mar '21

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 for FPU and XMM contexts in NtGetContextThread.
by Alexandre Julliard 01 Mar '21

01 Mar '21

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

Jacek Caban : ntdll: Use syscall frame for FPU and XMM contexts in NtSetContextThread.
by Alexandre Julliard 01 Mar '21

01 Mar '21

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

Hugh McMaster : reg/tests: Split 'delete' tests from reg.c.
by Alexandre Julliard 01 Mar '21

01 Mar '21

Module: wine Branch: master Commit: d3f9eaeb54cd272cb34f2863c74b47e414c87bee URL: https://source.winehq.org/git/wine.git/?a=commit;h=d3f9eaeb54cd272cb34f2863… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Mar 1 14:16:45 2021 +1100 reg/tests: Split 'delete' 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/delete.c | 123 ++++++++++++++++++++++++++++++++++++++++ programs/reg/tests/reg.c | 125 ++++------------------------------------- programs/reg/tests/reg_test.h | 56 ++++++++++++++++++ 4 files changed, 190 insertions(+), 115 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d3f9eaeb54cd272cb34f…

1 0

Hugh McMaster : reg/tests: Split 'query' tests from reg.c.
by Alexandre Julliard 01 Mar '21

01 Mar '21

Module: wine Branch: master Commit: 81a8938fa31de3d5a7a4c741582b4e5d9a2d1818 URL: https://source.winehq.org/git/wine.git/?a=commit;h=81a8938fa31de3d5a7a4c741… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Mar 1 14:16:46 2021 +1100 reg/tests: Split 'query' 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/query.c | 136 +++++++++++++++++++++++++++++++++++++++++ programs/reg/tests/reg.c | 108 +------------------------------- programs/reg/tests/reg_test.h | 3 + 4 files changed, 141 insertions(+), 107 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=81a8938fa31de3d5a7a4…

1 0

Hugh McMaster : reg/tests: Split first sequence of 'import' tests from reg.c.
by Alexandre Julliard 01 Mar '21

01 Mar '21

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

Hugh McMaster : reg/tests: Split first sequence of Unicode 'import' tests from reg.c.
by Alexandre Julliard 01 Mar '21

01 Mar '21

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 whitespace 'import' tests from reg.c.
by Alexandre Julliard 01 Mar '21

01 Mar '21

Module: wine Branch: master Commit: 56d9d0f791046aeab85466e2ebadac63ce457f86 URL: https://source.winehq.org/git/wine.git/?a=commit;h=56d9d0f791046aeab85466e2… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Mar 1 14:16:49 2021 +1100 reg/tests: Split whitespace '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 | 294 ++++++++++++++++++++++++++++++++++++++++++++ programs/reg/tests/reg.c | 294 -------------------------------------------- 2 files changed, 294 insertions(+), 294 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=56d9d0f791046aeab854…

1 0

Hugh McMaster : reg/tests: Split Windows 3.1 'import' tests from reg.c.
by Alexandre Julliard 01 Mar '21

01 Mar '21

Module: wine Branch: master Commit: fc5816a61e1f203b5c004d9fd25b43043954f386 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fc5816a61e1f203b5c004d9f… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Mar 1 14:16:50 2021 +1100 reg/tests: Split Windows 3.1 '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 | 116 ++++++++++++++++++++++++++++++++++++++++++++ programs/reg/tests/reg.c | 116 -------------------------------------------- 2 files changed, 116 insertions(+), 116 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=fc5816a61e1f203b5c00…

1 0