February 2021 - Wine-Commits

Rémi Bernon : widl: Use C++ template implementation for parameterized types.
by Alexandre Julliard Feb. 25, 2021

Feb. 25, 2021

Module: wine Branch: master Commit: 41a3087394b9a367c484b0be7675a42c627082e1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=41a3087394b9a367c484b0be… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Feb 25 14:16:10 2021 +0100 widl: Use C++ template implementation for parameterized types. Based on a patch from Steve Lhomme. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/header.c | 21 ++++++++++++++------- tools/widl/typetree.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++---- tools/widl/typetree.h | 6 ++++++ tools/widl/widltypes.h | 1 + 4 files changed, 67 insertions(+), 11 deletions(-) diff --git a/tools/widl/header.c b/tools/widl/header.c index d81c66a3558..a472af49066 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -1588,10 +1588,12 @@ static void write_forward(FILE *header, type_t *iface) fprintf(header, "#ifdef __cplusplus\n"); if (iface->namespace && !is_global_namespace(iface->namespace)) fprintf(header, "#define %s %s\n", iface->c_name, iface->qualified_name); - write_namespace_start(header, iface->namespace); - if (strchr(iface->name, '<')) write_line(header, 0, "template<> struct %s;", iface->name); - else write_line(header, 0, "interface %s;", iface->name); - write_namespace_end(header, iface->namespace); + if (!iface->impl_name) + { + write_namespace_start(header, iface->namespace); + write_line(header, 0, "interface %s;", iface->name); + write_namespace_end(header, iface->namespace); + } fprintf(header, "#endif /* __cplusplus */\n"); fprintf(header, "#endif\n\n" ); } @@ -1667,7 +1669,12 @@ static void write_com_interface_end(FILE *header, type_t *iface) if (strchr(iface->name, '<')) fprintf(header, "template<> struct "); else fprintf(header, "interface "); } - if (type_iface_get_inherit(iface)) + if (iface->impl_name) + { + fprintf(header, "%s : %s\n", iface->name, iface->impl_name); + write_line(header, 1, "{"); + } + else if (type_iface_get_inherit(iface)) { fprintf(header, "%s : public %s\n", iface->name, type_iface_get_inherit(iface)->name); @@ -1681,9 +1688,9 @@ static void write_com_interface_end(FILE *header, type_t *iface) } /* dispinterfaces don't have real functions, so don't write C++ functions for * them */ - if (!dispinterface) + if (!dispinterface && !iface->impl_name) write_cpp_method_def(header, iface); - if (!type_iface_get_inherit(iface)) + if (!type_iface_get_inherit(iface) && !iface->impl_name) write_line(header, 0, "END_INTERFACE\n"); write_line(header, -1, "};"); if (!is_global_namespace(iface->namespace)) { diff --git a/tools/widl/typetree.c b/tools/widl/typetree.c index 4a10dd6c4a4..eec98e5c23c 100644 --- a/tools/widl/typetree.c +++ b/tools/widl/typetree.c @@ -52,6 +52,7 @@ type_t *make_type(enum type_type type) t->c_name = NULL; t->signature = NULL; t->qualified_name = NULL; + t->impl_name = NULL; memset(&t->details, 0, sizeof(t->details)); t->typestring_offset = 0; t->ptrdesc = 0; @@ -127,6 +128,13 @@ static size_t append_namespaces(char **buf, size_t *len, size_t pos, struct name return n; } +static size_t append_pointer_stars(char **buf, size_t *len, size_t pos, type_t *type) +{ + size_t n = 0; + for (; type && type->type_type == TYPE_POINTER; type = type_pointer_get_ref_type(type)) n += strappend(buf, len, pos + n, "*"); + return n; +} + static size_t append_type_signature(char **buf, size_t *len, size_t pos, type_t *type); static size_t append_var_list_signature(char **buf, size_t *len, size_t pos, var_list_t *var_list) @@ -266,9 +274,9 @@ char *format_parameterized_type_name(type_t *type, typeref_list_t *params) pos += strappend(&buf, &len, pos, "%s<", type->name); if (params) LIST_FOR_EACH_ENTRY(ref, params, typeref_t, entry) { - for (type = ref->type; type->type_type == TYPE_POINTER; type = type_pointer_get_ref_type(type)) {} - pos += append_namespaces(&buf, &len, pos, type->namespace, "", "::", type->name, use_abi_namespace ? "ABI" : NULL); - for (type = ref->type; type->type_type == TYPE_POINTER; type = type_pointer_get_ref_type(type)) pos += strappend(&buf, &len, pos, "*"); + type = type_pointer_get_root_type(ref->type); + pos += strappend(&buf, &len, pos, "%s", type->qualified_name); + pos += append_pointer_stars(&buf, &len, pos, ref->type); if (list_next(params, &ref->entry)) pos += strappend(&buf, &len, pos, ","); } pos += strappend(&buf, &len, pos, ">"); @@ -292,7 +300,7 @@ static char *format_parameterized_type_c_name(type_t *type, typeref_list_t *para pos += strappend(&buf, &len, pos, "%s%s_%d", prefix, type->name, count); if (params) LIST_FOR_EACH_ENTRY(ref, params, typeref_t, entry) { - for (type = ref->type; type->type_type == TYPE_POINTER; type = type_pointer_get_ref_type(type)) {} + type = type_pointer_get_root_type(ref->type); pos += append_namespaces(&buf, &len, pos, type->namespace, "_", "__C", type->name, NULL); } @@ -334,6 +342,38 @@ static char *format_parameterized_type_signature(type_t *type, typeref_list_t *p return buf; } +static char *format_parameterized_type_impl_name(type_t *type, typeref_list_t *params, const char *prefix) +{ + size_t len = 0, pos = 0; + char *buf = NULL; + typeref_t *ref; + type_t *iface; + + pos += strappend(&buf, &len, pos, "%s%s_impl<", prefix, type->name); + if (params) LIST_FOR_EACH_ENTRY(ref, params, typeref_t, entry) + { + type = type_pointer_get_root_type(ref->type); + if (type->type_type == TYPE_RUNTIMECLASS) + { + pos += strappend(&buf, &len, pos, "ABI::Windows::Foundation::Internal::AggregateType<%s", type->qualified_name); + pos += append_pointer_stars(&buf, &len, pos, ref->type); + iface = type_runtimeclass_get_default_iface(type); + pos += strappend(&buf, &len, pos, ", %s", iface->qualified_name); + pos += append_pointer_stars(&buf, &len, pos, ref->type); + pos += strappend(&buf, &len, pos, ">"); + } + else + { + pos += strappend(&buf, &len, pos, "%s", type->qualified_name); + pos += append_pointer_stars(&buf, &len, pos, ref->type); + } + if (list_next(params, &ref->entry)) pos += strappend(&buf, &len, pos, ", "); + } + pos += strappend(&buf, &len, pos, ">"); + + return buf; +} + type_t *type_new_function(var_list_t *args) { var_t *arg; @@ -1226,11 +1266,13 @@ type_t *type_parameterized_type_specialize_define(type_t *type) error_loc("pinterface/pdelegate %s previously not declared a pinterface/pdelegate at %s:%d\n", iface->name, iface->loc_info.input_name, iface->loc_info.line_number); + iface->impl_name = format_parameterized_type_impl_name(type, repl, ""); iface->signature = format_parameterized_type_signature(type, repl); iface->defined = TRUE; if (iface->type_type == TYPE_DELEGATE) { iface = iface->details.delegate.iface; + iface->impl_name = format_parameterized_type_impl_name(type, repl, "I"); iface->signature = format_parameterized_type_signature(type, repl); iface->defined = TRUE; } diff --git a/tools/widl/typetree.h b/tools/widl/typetree.h index 0b7cd385cc2..b9833dc4e8f 100644 --- a/tools/widl/typetree.h +++ b/tools/widl/typetree.h @@ -411,6 +411,12 @@ static inline type_t *type_pointer_get_ref_type(const type_t *type) return type_pointer_get_ref(type)->type; } +static inline type_t *type_pointer_get_root_type(type_t *type) +{ + for (; type && type->type_type == TYPE_POINTER; type = type_pointer_get_ref_type(type)) {} + return type; +} + static inline type_t *type_bitfield_get_field(const type_t *type) { type = type_get_real_type(type); diff --git a/tools/widl/widltypes.h b/tools/widl/widltypes.h index 81646cae1d1..d37d732744b 100644 --- a/tools/widl/widltypes.h +++ b/tools/widl/widltypes.h @@ -504,6 +504,7 @@ struct _type_t { const char *c_name; const char *signature; const char *qualified_name; + const char *impl_name; unsigned int typestring_offset; unsigned int ptrdesc; /* used for complex structs */ int typelib_idx;

1 0

Piotr Caban : msvcrt: Improve acosf compatibility with native ucrtbase.
by Alexandre Julliard Feb. 25, 2021

Feb. 25, 2021

Module: wine Branch: master Commit: 9c8f8e715f4fd3a35924e4e9d32eb42fa8b56a18 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9c8f8e715f4fd3a35924e4e9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Feb 25 15:39:23 2021 +0100 msvcrt: Improve acosf compatibility with native ucrtbase. It reduces number of different acosf results from 5678739 to 240905. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 57 ++++++++++++++++++++---------------------------------- 1 file changed, 21 insertions(+), 36 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 6abc1893a52..d6b0d9422e7 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -287,28 +287,29 @@ int CDECL _isnanf( float num ) return (u.i & 0x7fffffff) > 0x7f800000; } -/********************************************************************* - * acosf (MSVCRT.@) - * - * Copied from musl: src/math/acosf.c - */ -static float acosf_R(float z) +static float asinf_R(float z) { - static const float pS0 = 1.6666586697e-01, - pS1 = -4.2743422091e-02, - pS2 = -8.6563630030e-03, - qS1 = -7.0662963390e-01; + /* coefficients for R(x^2) */ + static const float p1 = 1.66666672e-01, + p2 = -5.11644611e-02, + p3 = -1.21124933e-02, + p4 = -3.58742251e-03, + q1 = -7.56982703e-01; float p, q; - p = z * (pS0 + z * (pS1 + z * pS2)); - q = 1.0f + z * qS1; + p = z * (p1 + z * (p2 + z * (p3 + z * p4))); + q = 1.0f + z * q1; return p / q; } +/********************************************************************* + * acosf (MSVCRT.@) + * + * Copied from musl: src/math/acosf.c + */ float CDECL acosf( float x ) { - static const float pio2_hi = 1.5707962513e+00, - pio2_lo = 7.5497894159e-08; + static const double pio2_lo = 6.12323399573676603587e-17; float z, w, s, c, df; unsigned int hx, ix; @@ -319,7 +320,7 @@ float CDECL acosf( float x ) if (ix >= 0x3f800000) { if (ix == 0x3f800000) { if (hx >> 31) - return 2 * pio2_lo + 2 * pio2_hi + 7.5231638453e-37; + return M_PI; return 0; } if (isnan(x)) return x; @@ -328,23 +329,22 @@ float CDECL acosf( float x ) /* |x| < 0.5 */ if (ix < 0x3f000000) { if (ix <= 0x32800000) /* |x| < 2**-26 */ - return pio2_lo + pio2_hi + 7.5231638453e-37; - return pio2_hi - (x - (pio2_lo - x * acosf_R(x * x))); + return M_PI_2; + return M_PI_2 - (x - (pio2_lo - x * asinf_R(x * x))); } /* x < -0.5 */ if (hx >> 31) { z = (1 + x) * 0.5f; s = sqrtf(z); - w = acosf_R(z) * s - pio2_lo; - return 2 * (pio2_hi - (s + w)); + return M_PI - 2 * (s + ((double)s * asinf_R(z))); } /* x > 0.5 */ z = (1 - x) * 0.5f; s = sqrtf(z); - hx = *(unsigned int*)&s & 0xfffff000; + hx = *(unsigned int*)&s & 0xffff0000; df = *(float*)&hx; c = (z - df * df) / (s + df); - w = acosf_R(z) * s + c; + w = asinf_R(z) * s + c; return 2 * (df + w); } @@ -353,21 +353,6 @@ float CDECL acosf( float x ) * * Copied from musl: src/math/asinf.c */ -static float asinf_R(float z) -{ - /* coefficients for R(x^2) */ - static const float p1 = 1.66666672e-01, - p2 = -5.11644611e-02, - p3 = -1.21124933e-02, - p4 = -3.58742251e-03, - q1 = -7.56982703e-01; - - float p, q; - p = z * (p1 + z * (p2 + z * (p3 + z * p4))); - q = 1.0f + z * q1; - return p / q; -} - float CDECL asinf( float x ) { static const double pio2 = 1.570796326794896558e+00;

1 0

Jacek Caban : ntdll: Reserve space for full i386 context in syscall frame.
by Alexandre Julliard Feb. 25, 2021

Feb. 25, 2021

Module: wine Branch: master Commit: c6d303ca233e45f891ea14234c58e1d1809d4600 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c6d303ca233e45f891ea1423… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 25 18:53:36 2021 +0100 ntdll: Reserve space for full i386 context in syscall frame. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_i386.c | 62 ++++++++++++++++++++++++++----------------- tools/winebuild/import.c | 26 +++++++++--------- 2 files changed, 51 insertions(+), 37 deletions(-) diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c index 6cc80809316..6c46c615f56 100644 --- a/dlls/ntdll/unix/signal_i386.c +++ b/dlls/ntdll/unix/signal_i386.c @@ -463,12 +463,24 @@ enum i386_trap_code struct syscall_frame { - DWORD edi; - DWORD esi; - DWORD ebx; - DWORD ebp; - DWORD thunk_addr; - DWORD ret_addr; + DWORD eflags; /* 00 */ + DWORD eip; /* 04 */ + DWORD esp; /* 08 */ + WORD cs; /* 0c */ + WORD ss; /* 0e */ + WORD ds; /* 10 */ + WORD es; /* 12 */ + WORD fs; /* 14 */ + WORD gs; /* 16 */ + DWORD eax; /* 18 */ + DWORD ebx; /* 1c */ + DWORD ecx; /* 20 */ + DWORD edx; /* 24 */ + DWORD edi; /* 28 */ + DWORD esi; /* 2c */ + DWORD ebp; /* 30 */ + DWORD thunk_addr; + DWORD ret_addr; }; struct x86_thread_data @@ -1292,10 +1304,10 @@ NTSTATUS WINAPI NtGetContextThread( HANDLE handle, CONTEXT *context ) { if (needed_flags & CONTEXT_INTEGER) { - context->Eax = 0; + context->Eax = frame->eax; context->Ebx = frame->ebx; - context->Ecx = 0; - context->Edx = 0; + context->Ecx = frame->ecx; + context->Edx = frame->edx; context->Esi = frame->esi; context->Edi = frame->edi; context->ContextFlags |= CONTEXT_INTEGER; @@ -1720,7 +1732,7 @@ struct apc_stack_layout * WINAPI setup_user_apc_dispatcher_stack( CONTEXT *conte } C_ASSERT( sizeof(struct apc_stack_layout) == 0x2e0 ); -C_ASSERT( offsetof(struct syscall_frame, ret_addr) == 0x14 ); +C_ASSERT( offsetof(struct syscall_frame, ret_addr) == 0x38 ); C_ASSERT( offsetof(struct apc_stack_layout, context) == 20 ); /*********************************************************************** @@ -1735,7 +1747,7 @@ __ASM_GLOBAL_FUNC( call_user_apc_dispatcher, "movl 0xc4(%esi),%eax\n\t" /* context_ptr->Esp */ "jmp 2f\n\t" "1:\tmovl %fs:0x1f8,%eax\n\t" /* x86_thread_data()->syscall_frame */ - "leal 0x14(%eax),%eax\n\t" /* &x86_thread_data()->syscall_frame->ret_addr */ + "leal 0x38(%eax),%eax\n\t" /* &x86_thread_data()->syscall_frame->ret_addr */ "2:\tsubl $0x2e0,%eax\n\t" /* sizeof(struct apc_stack_layout) */ "movl %ebp,%esp\n\t" /* pop return address */ "cmpl %esp,%eax\n\t" @@ -1759,14 +1771,14 @@ __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 0(%eax),%edi\n\t" /* frame->edi */ - "movl 4(%eax),%esi\n\t" /* frame->esi */ - "movl 8(%eax),%ebx\n\t" /* frame->ebx */ - "movl 12(%eax),%ebp\n\t" /* frame->ebp */ - "movl 4(%esp),%edx\n\t" /* 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 20(%eax),%esp\n\t" + "leal 0x38(%eax),%esp\n\t" "jmp *%edx" ) @@ -1780,15 +1792,15 @@ __ASM_GLOBAL_FUNC( call_user_exception_dispatcher, "jne 1f\n\t" "decl 0xb8(%ecx)\n" /* context->Eip */ "1:\tmovl %fs:0x1f8,%eax\n\t" /* x86_thread_data()->syscall_frame */ - "movl 0(%eax),%edi\n\t" /* frame->edi */ - "movl 4(%eax),%esi\n\t" /* frame->esi */ - "movl 8(%eax),%ebx\n\t" /* frame->ebx */ - "movl 12(%eax),%ebp\n\t" /* frame->ebp */ - "movl %edx,12(%eax)\n\t" - "movl %ecx,16(%eax)\n\t" + "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 %edx,0x30(%eax)\n\t" + "movl %ecx,0x34(%eax)\n\t" "movl 12(%esp),%edx\n\t" /* dispatcher */ "movl $0,%fs:0x1f8\n\t" - "leal 12(%eax),%esp\n\t" + "leal 0x30(%eax),%esp\n\t" "jmp *%edx" ) /********************************************************************** diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index 57b79ff187d..8620e9be479 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -1438,12 +1438,13 @@ static void output_syscall_dispatcher( int count, const char *variant ) output_cfi( ".cfi_rel_offset %%ebp,0\n" ); output( "\tmovl %%esp,%%ebp\n" ); output_cfi( ".cfi_def_cfa_register %%ebp\n" ); - output( "\tpushl %%ebx\n" ); - output_cfi( ".cfi_rel_offset %%ebx,-4\n" ); - output( "\tpushl %%esi\n" ); - output_cfi( ".cfi_rel_offset %%esi,-8\n" ); - output( "\tpushl %%edi\n" ); - output_cfi( ".cfi_rel_offset %%edi,-12\n" ); + output( "\tsubl $0x30,%%esp\n" ); + output( "\tmovl %%ebx,-0x14(%%ebp)\n" ); + output_cfi( ".cfi_rel_offset %%ebx,-0x14\n" ); + output( "\tmovl %%edi,-0x08(%%ebp)\n" ); + output_cfi( ".cfi_rel_offset %%edi,-0x08\n" ); + output( "\tmovl %%esi,-0x04(%%ebp)\n" ); + output_cfi( ".cfi_rel_offset %%esi,-0x04\n" ); output( "\tmovl %%esp,%%fs:0x1f8\n" ); /* x86_thread_data()->syscall_frame */ output( "\tcmpl $%u,%%eax\n", count ); output( "\tjae 3f\n" ); @@ -1466,16 +1467,17 @@ static void output_syscall_dispatcher( int count, const char *variant ) output( "\tcall *.Lsyscall_table-1b(%%eax,%%edx,4)\n" ); else output( "\tcall *.Lsyscall_table(,%%eax,4)\n" ); - output( "\tleal -12(%%ebp),%%esp\n" ); output( "2:\tmovl $0,%%fs:0x1f8\n" ); - output( "\tpopl %%edi\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( "\tpopl %%esi\n" ); + output( "\tmovl -0x04(%%ebp),%%esi\n" ); output_cfi( ".cfi_same_value %%esi\n" ); - output( "\tpopl %%ebx\n" ); - output_cfi( ".cfi_same_value %%ebx\n" ); + output( "\tmovl %%ebp,%%esp\n" ); + output_cfi( ".cfi_def_cfa %%esp,8\n" ); output( "\tpopl %%ebp\n" ); - output_cfi( ".cfi_def_cfa %%esp,4\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 );

1 0

Jacek Caban : ntdll: Store all non-volatile i386 registers in syscall dispatcher.
by Alexandre Julliard Feb. 25, 2021

Feb. 25, 2021

Module: wine Branch: master Commit: b04f2689a2b87c657781c0b6ddad16c73348ddb1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b04f2689a2b87c657781c0b6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 25 18:53:56 2021 +0100 ntdll: Store all non-volatile i386 registers in syscall dispatcher. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_i386.c | 29 ++++++++++++++--------------- tools/winebuild/import.c | 13 ++++++++++++- 2 files changed, 26 insertions(+), 16 deletions(-) diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c index 6c46c615f56..be3f1060e4a 100644 --- a/dlls/ntdll/unix/signal_i386.c +++ b/dlls/ntdll/unix/signal_i386.c @@ -479,10 +479,10 @@ struct syscall_frame DWORD edi; /* 28 */ DWORD esi; /* 2c */ DWORD ebp; /* 30 */ - DWORD thunk_addr; - DWORD ret_addr; }; +C_ASSERT( sizeof(struct syscall_frame) == 0x34 ); + struct x86_thread_data { DWORD fs; /* 1d4 TEB selector */ @@ -1314,20 +1314,20 @@ NTSTATUS WINAPI NtGetContextThread( HANDLE handle, CONTEXT *context ) } if (needed_flags & CONTEXT_CONTROL) { - context->Esp = (DWORD)&frame->ret_addr; + context->Esp = frame->esp; context->Ebp = frame->ebp; - context->Eip = frame->thunk_addr; - context->EFlags = 0x202; - context->SegCs = get_cs(); - context->SegSs = get_ds(); + context->Eip = frame->eip; + context->EFlags = frame->eflags; + context->SegCs = frame->cs; + context->SegSs = frame->ds; context->ContextFlags |= CONTEXT_CONTROL; } if (needed_flags & CONTEXT_SEGMENTS) { - context->SegDs = get_ds(); - context->SegEs = get_ds(); - context->SegFs = get_fs(); - context->SegGs = get_gs(); + context->SegDs = frame->ds; + context->SegEs = frame->es; + context->SegFs = frame->fs; + context->SegGs = frame->gs; context->ContextFlags |= CONTEXT_SEGMENTS; } if (needed_flags & CONTEXT_FLOATING_POINT) save_fpu( context ); @@ -1732,7 +1732,6 @@ struct apc_stack_layout * WINAPI setup_user_apc_dispatcher_stack( CONTEXT *conte } C_ASSERT( sizeof(struct apc_stack_layout) == 0x2e0 ); -C_ASSERT( offsetof(struct syscall_frame, ret_addr) == 0x38 ); C_ASSERT( offsetof(struct apc_stack_layout, context) == 20 ); /*********************************************************************** @@ -1916,14 +1915,14 @@ static BOOL handle_syscall_fault( ucontext_t *sigcontext, void *stack_ptr, } else { - TRACE( "returning to user mode ip=%08x ret=%08x\n", frame->ret_addr, rec->ExceptionCode ); + TRACE( "returning to user mode ip=%08x ret=%08x\n", frame->eip, rec->ExceptionCode ); EAX_sig(sigcontext) = rec->ExceptionCode; EBX_sig(sigcontext) = frame->ebx; ESI_sig(sigcontext) = frame->esi; EDI_sig(sigcontext) = frame->edi; EBP_sig(sigcontext) = frame->ebp; - ESP_sig(sigcontext) = (DWORD)&frame->ret_addr; - EIP_sig(sigcontext) = frame->thunk_addr; + ESP_sig(sigcontext) = frame->esp; + EIP_sig(sigcontext) = frame->eip; x86_thread_data()->syscall_frame = NULL; } return TRUE; diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index 8620e9be479..720cf0589fd 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -1438,13 +1438,24 @@ static void output_syscall_dispatcher( int count, const char *variant ) output_cfi( ".cfi_rel_offset %%ebp,0\n" ); output( "\tmovl %%esp,%%ebp\n" ); output_cfi( ".cfi_def_cfa_register %%ebp\n" ); - output( "\tsubl $0x30,%%esp\n" ); + output( "\tleal -0x2c(%%esp),%%esp\n" ); output( "\tmovl %%ebx,-0x14(%%ebp)\n" ); output_cfi( ".cfi_rel_offset %%ebx,-0x14\n" ); output( "\tmovl %%edi,-0x08(%%ebp)\n" ); output_cfi( ".cfi_rel_offset %%edi,-0x08\n" ); output( "\tmovl %%esi,-0x04(%%ebp)\n" ); output_cfi( ".cfi_rel_offset %%esi,-0x04\n" ); + output( "\tpushfl\n" ); + output( "\tmovw %%gs,-0x1a(%%ebp)\n" ); + output( "\tmovw %%fs,-0x1c(%%ebp)\n" ); + output( "\tmovw %%es,-0x1e(%%ebp)\n" ); + output( "\tmovw %%ds,-0x20(%%ebp)\n" ); + output( "\tmovw %%ss,-0x22(%%ebp)\n" ); + output( "\tmovw %%cs,-0x24(%%ebp)\n" ); + output( "\tleal 8(%%ebp),%%ecx\n" ); + 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( "\tcmpl $%u,%%eax\n", count ); output( "\tjae 3f\n" );

1 0

Jacek Caban : ntdll: Use syscall frame in x86 set_full_cpu_context implementation.
by Alexandre Julliard Feb. 25, 2021

Feb. 25, 2021

Module: wine Branch: master Commit: 35e43ccf1b42e9f67d7765753f0c3ef8cf102c46 URL: https://source.winehq.org/git/wine.git/?a=commit;h=35e43ccf1b42e9f67d776575… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 25 18:54:24 2021 +0100 ntdll: Use syscall frame in x86 set_full_cpu_context 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 | 123 +++++++++++++++++++++++------------------- 1 file changed, 68 insertions(+), 55 deletions(-) diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c index be3f1060e4a..73b16b645bb 100644 --- a/dlls/ntdll/unix/signal_i386.c +++ b/dlls/ntdll/unix/signal_i386.c @@ -820,16 +820,6 @@ static inline void restore_xstate( const CONTEXT *context ) } -/*********************************************************************** - * signal_restore_full_cpu_context - * - * Restore full context from syscall frame - */ -void signal_restore_full_cpu_context(void) -{ -} - - /*********************************************************************** * fpux_to_fpu * @@ -991,36 +981,36 @@ static inline void restore_context( const struct xcontext *xcontext, ucontext_t * * Set the new CPU context. */ -extern void set_full_cpu_context( const CONTEXT *context ); +extern void set_full_cpu_context(void); __ASM_GLOBAL_FUNC( set_full_cpu_context, - "movl $0,%fs:0x1f8\n\t" /* x86_thread_data()->syscall_frame = NULL */ - "movl 4(%esp),%ecx\n\t" - "movw 0x8c(%ecx),%gs\n\t" /* SegGs */ - "movw 0x90(%ecx),%fs\n\t" /* SegFs */ - "movw 0x94(%ecx),%es\n\t" /* SegEs */ - "movl 0x9c(%ecx),%edi\n\t" /* Edi */ - "movl 0xa0(%ecx),%esi\n\t" /* Esi */ - "movl 0xa4(%ecx),%ebx\n\t" /* Ebx */ - "movl 0xb4(%ecx),%ebp\n\t" /* Ebp */ + "movl %fs:0x1f8,%ecx\n\t" + "movl $0,%fs:0x1f8\n\t" /* x86_thread_data()->syscall_frame = NULL */ + "movw 0x16(%ecx),%gs\n\t" /* SegGs */ + "movw 0x14(%ecx),%fs\n\t" /* SegFs */ + "movw 0x12(%ecx),%es\n\t" /* SegEs */ + "movl 0x1c(%ecx),%ebx\n\t" /* Ebx */ + "movl 0x28(%ecx),%edi\n\t" /* Edi */ + "movl 0x2c(%ecx),%esi\n\t" /* Esi */ + "movl 0x30(%ecx),%ebp\n\t" /* Ebp */ "movw %ss,%ax\n\t" - "cmpw 0xc8(%ecx),%ax\n\t" /* SegSs */ + "cmpw 0x0e(%ecx),%ax\n\t" /* SegSs */ "jne 1f\n\t" /* 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. */ - "movl 0xc4(%ecx),%eax\n\t" /* Esp */ + "movl 0x08(%ecx),%eax\n\t" /* Esp */ "leal -4*4(%eax),%eax\n\t" - "movl 0xc0(%ecx),%edx\n\t" /* EFlags */ + "movl (%ecx),%edx\n\t" /* EFlags */ "movl %edx,3*4(%eax)\n\t" - "movl 0xbc(%ecx),%edx\n\t" /* SegCs */ + "movl 0x0c(%ecx),%edx\n\t" /* SegCs */ "movl %edx,2*4(%eax)\n\t" - "movl 0xb8(%ecx),%edx\n\t" /* Eip */ + "movl 0x04(%ecx),%edx\n\t" /* Eip */ "movl %edx,1*4(%eax)\n\t" - "movl 0xb0(%ecx),%edx\n\t" /* Eax */ + "movl 0x18(%ecx),%edx\n\t" /* Eax */ "movl %edx,0*4(%eax)\n\t" - "pushl 0x98(%ecx)\n\t" /* SegDs */ - "movl 0xa8(%ecx),%edx\n\t" /* Edx */ - "movl 0xac(%ecx),%ecx\n\t" /* Ecx */ + "pushl 0x10(%ecx)\n\t" /* SegDs */ + "movl 0x24(%ecx),%edx\n\t" /* Edx */ + "movl 0x20(%ecx),%ecx\n\t" /* Ecx */ "popl %ds\n\t" "movl %eax,%esp\n\t" "popl %eax\n\t" @@ -1030,19 +1020,30 @@ __ASM_GLOBAL_FUNC( set_full_cpu_context, * is 16 or 32 bit, and 'movl' will throw an exception when we try to * access memory above the limit. */ "1:\n\t" - "movl 0xa8(%ecx),%edx\n\t" /* Edx */ - "movl 0xb0(%ecx),%eax\n\t" /* Eax */ - "movw 0xc8(%ecx),%ss\n\t" /* SegSs */ - "movl 0xc4(%ecx),%esp\n\t" /* Esp */ - "pushl 0xc0(%ecx)\n\t" /* EFlags */ - "pushl 0xbc(%ecx)\n\t" /* SegCs */ - "pushl 0xb8(%ecx)\n\t" /* Eip */ - "pushl 0x98(%ecx)\n\t" /* SegDs */ - "movl 0xac(%ecx),%ecx\n\t" /* Ecx */ + "movl 0x24(%ecx),%edx\n\t" /* Edx */ + "movl 0x18(%ecx),%eax\n\t" /* Eax */ + "movw 0x0e(%ecx),%ss\n\t" /* SegSs */ + "movl 0x08(%ecx),%esp\n\t" /* Esp */ + "pushl 0x00(%ecx)\n\t" /* EFlags */ + "pushl 0x0c(%ecx)\n\t" /* SegCs */ + "pushl 0x04(%ecx)\n\t" /* Eip */ + "pushl 0x10(%ecx)\n\t" /* SegDs */ + "movl 0x20(%ecx),%ecx\n\t" /* Ecx */ "popl %ds\n\t" "iret" ) +/*********************************************************************** + * signal_restore_full_cpu_context + * + * Restore full context from syscall frame + */ +void signal_restore_full_cpu_context(void) +{ + set_full_cpu_context(); +} + + /*********************************************************************** * get_server_context_flags * @@ -1215,6 +1216,7 @@ NTSTATUS context_from_server( CONTEXT *to, const context_t *from ) NTSTATUS WINAPI NtSetContextThread( HANDLE handle, const CONTEXT *context ) { NTSTATUS ret = STATUS_SUCCESS; + struct syscall_frame *frame = x86_thread_data()->syscall_frame; DWORD flags = context->ContextFlags & ~CONTEXT_i386; BOOL self = (handle == GetCurrentThread()); @@ -1244,28 +1246,39 @@ NTSTATUS WINAPI NtSetContextThread( HANDLE handle, const CONTEXT *context ) } } + if (flags & CONTEXT_INTEGER) + { + frame->eax = context->Eax; + frame->ebx = context->Ebx; + frame->ecx = context->Ecx; + frame->edx = context->Edx; + frame->esi = context->Esi; + frame->edi = context->Edi; + } + if (flags & CONTEXT_CONTROL) + { + frame->esp = context->Esp; + frame->ebp = context->Ebp; + frame->eip = context->Eip; + frame->eflags = context->EFlags; + frame->cs = context->SegCs; + frame->ss = context->SegSs; + } + if (flags & CONTEXT_SEGMENTS) + { + frame->ds = context->SegDs; + frame->es = context->SegEs; + 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 ); restore_xstate( context ); - if (flags & CONTEXT_FULL) - { - if (!(flags & CONTEXT_CONTROL)) - FIXME( "setting partial context (%x) not supported\n", flags ); - else if (flags & CONTEXT_SEGMENTS) - set_full_cpu_context( context ); - else - { - CONTEXT newcontext = *context; - newcontext.SegDs = get_ds(); - newcontext.SegEs = get_ds(); - newcontext.SegFs = get_fs(); - newcontext.SegGs = get_gs(); - set_full_cpu_context( &newcontext ); - } - } - return ret; + if (!(flags & CONTEXT_INTEGER)) frame->eax = STATUS_SUCCESS; + signal_restore_full_cpu_context(); + return STATUS_SUCCESS; }

1 0

Alexandre Julliard : wsnmp32: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard Feb. 25, 2021

Feb. 25, 2021

Module: wine Branch: master Commit: 96d1c58e7087dada6d5d9d45aff0dc07063b0625 URL: https://source.winehq.org/git/wine.git/?a=commit;h=96d1c58e7087dada6d5d9d45… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 25 08:59:48 2021 +0100 wsnmp32: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wsnmp32/Makefile.in | 2 +- dlls/wsnmp32/wsnmp32.c | 15 --------------- 2 files changed, 1 insertion(+), 16 deletions(-) diff --git a/dlls/wsnmp32/Makefile.in b/dlls/wsnmp32/Makefile.in index db01f47b298..c7b263bd964 100644 --- a/dlls/wsnmp32/Makefile.in +++ b/dlls/wsnmp32/Makefile.in @@ -1,6 +1,6 @@ MODULE = wsnmp32.dll IMPORTLIB = wsnmp32 -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = wsnmp32.c diff --git a/dlls/wsnmp32/wsnmp32.c b/dlls/wsnmp32/wsnmp32.c index 3dc54cb5fac..f0df30b3b4c 100644 --- a/dlls/wsnmp32/wsnmp32.c +++ b/dlls/wsnmp32/wsnmp32.c @@ -24,21 +24,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(wsnmp32); -BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) -{ - TRACE("%p, %u, %p\n", hinst, reason, reserved); - - switch (reason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls( hinst ); - break; - } - return TRUE; -} - SNMPAPI_STATUS WINAPI SnmpCleanup( void ) { FIXME( "\n" );

1 0

Alexandre Julliard : winsta: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard Feb. 25, 2021

Feb. 25, 2021

Module: wine Branch: master Commit: 60933c5b93a4494fa70234903386100863a121db URL: https://source.winehq.org/git/wine.git/?a=commit;h=60933c5b93a4494fa7023490… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 25 08:59:36 2021 +0100 winsta: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winsta/Makefile.in | 2 +- dlls/winsta/main.c | 18 ------------------ 2 files changed, 1 insertion(+), 19 deletions(-) diff --git a/dlls/winsta/Makefile.in b/dlls/winsta/Makefile.in index 58f9ca1812d..a83405a806d 100644 --- a/dlls/winsta/Makefile.in +++ b/dlls/winsta/Makefile.in @@ -1,6 +1,6 @@ MODULE = winsta.dll -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ main.c diff --git a/dlls/winsta/main.c b/dlls/winsta/main.c index 7568310aeaa..9ec4d64d0b6 100644 --- a/dlls/winsta/main.c +++ b/dlls/winsta/main.c @@ -27,24 +27,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(winsta); -BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) -{ - TRACE("(0x%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); - - switch (fdwReason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(hinstDLL); - break; - default: - break; - } - - return TRUE; -} - BOOLEAN WINAPI WinStationQueryInformationA( HANDLE server, ULONG logon_id, WINSTATIONINFOCLASS class, void *info, ULONG len, ULONG *ret_len ) {

1 0

Alexandre Julliard : winnls32: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard Feb. 25, 2021

Feb. 25, 2021

Module: wine Branch: master Commit: 9bfaaea8facf87dbddb83a9568b80c37947ae1ab URL: https://source.winehq.org/git/wine.git/?a=commit;h=9bfaaea8facf87dbddb83a95… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 25 08:59:32 2021 +0100 winnls32: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winnls32/Makefile.in | 2 +- dlls/winnls32/winnls.c | 16 ---------------- 2 files changed, 1 insertion(+), 17 deletions(-) diff --git a/dlls/winnls32/Makefile.in b/dlls/winnls32/Makefile.in index c94375a2516..d7787abf08c 100644 --- a/dlls/winnls32/Makefile.in +++ b/dlls/winnls32/Makefile.in @@ -1,7 +1,7 @@ MODULE = winnls32.dll IMPORTLIB = winnls32 -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ winnls.c diff --git a/dlls/winnls32/winnls.c b/dlls/winnls32/winnls.c index 517a53cf7cd..b89a6a8cc6b 100644 --- a/dlls/winnls32/winnls.c +++ b/dlls/winnls32/winnls.c @@ -22,22 +22,6 @@ #include "winbase.h" #include "winnls32.h" -/*********************************************************************** - * DllMain (WINNLS.@) - */ -BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) -{ - switch(reason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls( inst ); - break; - } - return TRUE; -} - /*********************************************************************** * WINNLS32GetEnableStatus (WINNLS32.2) */

1 0

Rémi Bernon : include: Add AggregateType / GetAbiType / GetLogicalType WinRT templates.
by Alexandre Julliard Feb. 25, 2021

Feb. 25, 2021

Module: wine Branch: master Commit: 2e262c59dfbd379232f9af93d5b1e79f3cf16b05 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2e262c59dfbd379232f9af93… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Feb 25 14:14:23 2021 +0100 include: Add AggregateType / GetAbiType / GetLogicalType WinRT templates. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/windows.foundation.collections.idl | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/include/windows.foundation.collections.idl b/include/windows.foundation.collections.idl index 9f7a59ab907..cf47adfa7e4 100644 --- a/include/windows.foundation.collections.idl +++ b/include/windows.foundation.collections.idl @@ -27,6 +27,19 @@ import "windowscontracts.idl"; namespace Windows { namespace Foundation { + +cpp_quote("#ifdef __cplusplus") +cpp_quote("} /* extern \"C\" */") +cpp_quote("namespace ABI { namespace Windows { namespace Foundation { namespace Internal {") +cpp_quote("template <class T> struct GetAbiType { typedef T type; };") +cpp_quote("template <class T> struct GetLogicalType { typedef T type; };") +cpp_quote("template <class L, class A> struct AggregateType {};") +cpp_quote("template <class L, class A> struct GetAbiType<AggregateType<L, A>> { typedef A type; };") +cpp_quote("template <class L, class A> struct GetLogicalType<AggregateType<L, A>> { typedef L type; };") +cpp_quote("}}}}") +cpp_quote("extern \"C\" {") +cpp_quote("#endif") + #ifdef __WIDL__ [ contract(Windows.Foundation.FoundationContract, 1.0),

1 0

Nikolay Sivov : wbemdisp: Use context object internally for named value set.
by Alexandre Julliard Feb. 25, 2021

Feb. 25, 2021

Module: wine Branch: master Commit: 7709d9b87063015b6295a6b5bcdcfc52576e4f49 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7709d9b87063015b6295a6b5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Feb 25 10:04:31 2021 +0300 wbemdisp: Use context object internally for named value set. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemdisp/locator.c | 241 +++++++++++++++++++++++++++++++++++++++-- dlls/wbemdisp/tests/wbemdisp.c | 76 +++++++++++++ 2 files changed, 308 insertions(+), 9 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7709d9b87063015b6295…

1 0