February 2021 - Wine-commits

Rémi Bernon : widl: Factor and cleanup module type declaration and definition.
by Alexandre Julliard 05 Feb '21

05 Feb '21

Module: wine Branch: master Commit: 6f1308cd6240776d8a3474e6d98f055599a1e07b URL: https://source.winehq.org/git/wine.git/?a=commit;h=6f1308cd6240776d8a3474e6… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Feb 5 10:11:03 2021 +0100 widl: Factor and cleanup module type declaration and definition. 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/parser.y | 20 ++++++-------------- tools/widl/typetree.c | 27 +++++++++++++++------------ tools/widl/typetree.h | 5 +++-- 3 files changed, 24 insertions(+), 28 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 8c805e481f8..782ed39643c 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -95,7 +95,6 @@ static attr_list_t *check_struct_attrs(attr_list_t *attrs); static attr_list_t *check_union_attrs(attr_list_t *attrs); static attr_list_t *check_field_attrs(const char *name, attr_list_t *attrs); static attr_list_t *check_library_attrs(const char *name, attr_list_t *attrs); -static attr_list_t *check_module_attrs(const char *name, attr_list_t *attrs); const char *get_attr_display_name(enum attr_type type); static void add_explicit_handle_if_necessary(const type_t *iface, var_t *func); @@ -285,7 +284,7 @@ static typelib_t *current_typelib; %type <type> inherit interface interfacedef %type <type> interfaceref %type <type> dispinterface dispinterfacedef -%type <type> module modulehdr moduledef +%type <type> module moduledef %type <str> namespacedef %type <type> base_type int_std %type <type> enumdef structdef uniondef typedecl @@ -985,19 +984,12 @@ interfaceref: | tDISPINTERFACE aKNOWNTYPE { $$ = get_type(TYPE_INTERFACE, $2, current_namespace, 0); } ; -module: tMODULE aIDENTIFIER { $$ = type_new_module($2); } - | tMODULE aKNOWNTYPE { $$ = type_new_module($2); } +module: tMODULE aIDENTIFIER { $$ = type_module_declare($2); } + | tMODULE aKNOWNTYPE { $$ = type_module_declare($2); } ; -modulehdr: attributes module { $$ = $2; - $$->attrs = check_module_attrs($2->name, $1); - } - ; - -moduledef: modulehdr '{' int_statements '}' - semicolon_opt { $$ = $1; - type_module_define($$, $3); - } +moduledef: attributes module '{' int_statements '}' semicolon_opt + { $$ = type_module_define($2, $1, $4); } ; storage_cls_spec: @@ -2476,7 +2468,7 @@ attr_list_t *check_dispiface_attrs(const char *name, attr_list_t *attrs) return attrs; } -static attr_list_t *check_module_attrs(const char *name, attr_list_t *attrs) +attr_list_t *check_module_attrs(const char *name, attr_list_t *attrs) { const attr_t *attr; if (!attrs) return attrs; diff --git a/tools/widl/typetree.c b/tools/widl/typetree.c index 004f7fc7b0d..b3f0725f00e 100644 --- a/tools/widl/typetree.c +++ b/tools/widl/typetree.c @@ -195,16 +195,6 @@ type_t *type_new_alias(const decl_spec_t *t, const char *name) return a; } -type_t *type_new_module(char *name) -{ - type_t *type = get_type(TYPE_MODULE, name, NULL, 0); - if (type->type_type != TYPE_MODULE || type->defined) - error_loc("%s: redefinition error; original definition was at %s:%d\n", - type->name, type->loc_info.input_name, type->loc_info.line_number); - type->name = name; - return type; -} - type_t *type_new_array(const char *name, const decl_spec_t *element, int declptr, unsigned int dim, expr_t *size_is, expr_t *length_is) { @@ -519,12 +509,25 @@ type_t *type_dispinterface_define_from_iface(type_t *dispiface, attr_list_t *att return dispiface; } -void type_module_define(type_t *module, statement_list_t *stmts) +type_t *type_module_declare(char *name) +{ + type_t *type = get_type(TYPE_MODULE, name, NULL, 0); + if (type_get_type_detect_alias(type) != TYPE_MODULE) + error_loc("module %s previously not declared a module at %s:%d\n", + type->name, type->loc_info.input_name, type->loc_info.line_number); + return type; +} + +type_t *type_module_define(type_t* module, attr_list_t *attrs, statement_list_t *stmts) { - if (module->details.module) error_loc("multiple definition error\n"); + if (module->defined) + error_loc("module %s already defined at %s:%d\n", + module->name, module->loc_info.input_name, module->loc_info.line_number); + module->attrs = check_module_attrs(module->name, attrs); module->details.module = xmalloc(sizeof(*module->details.module)); module->details.module->stmts = stmts; module->defined = TRUE; + return module; } type_t *type_coclass_declare(char *name) diff --git a/tools/widl/typetree.h b/tools/widl/typetree.h index 7c19da8e045..8e04537ab4d 100644 --- a/tools/widl/typetree.h +++ b/tools/widl/typetree.h @@ -33,12 +33,13 @@ attr_list_t *check_apicontract_attrs(const char *name, attr_list_t *attrs); attr_list_t *check_coclass_attrs(const char *name, attr_list_t *attrs); attr_list_t *check_dispiface_attrs(const char *name, attr_list_t *attrs); attr_list_t *check_interface_attrs(const char *name, attr_list_t *attrs); +attr_list_t *check_module_attrs(const char *name, attr_list_t *attrs); attr_list_t *check_runtimeclass_attrs(const char *name, attr_list_t *attrs); type_t *type_new_function(var_list_t *args); type_t *type_new_pointer(type_t *ref); type_t *type_new_alias(const decl_spec_t *t, const char *name); -type_t *type_new_module(char *name); +type_t *type_module_declare(char *name); type_t *type_new_array(const char *name, const decl_spec_t *element, int declptr, unsigned int dim, expr_t *size_is, expr_t *length_is); type_t *type_new_basic(enum type_basic_type basic_type); @@ -56,7 +57,7 @@ type_t *type_interface_define(type_t *iface, attr_list_t *attrs, type_t *inherit type_t *type_dispinterface_declare(char *name); type_t *type_dispinterface_define(type_t *iface, attr_list_t *attrs, var_list_t *props, var_list_t *methods); type_t *type_dispinterface_define_from_iface(type_t *dispiface, attr_list_t *attrs, type_t *iface); -void type_module_define(type_t *module, statement_list_t *stmts); +type_t *type_module_define(type_t* module, attr_list_t *attrs, statement_list_t *stmts); type_t *type_coclass_define(type_t *coclass, attr_list_t *attrs, ifref_list_t *ifaces); type_t *type_runtimeclass_define(type_t *runtimeclass, attr_list_t *attrs, ifref_list_t *ifaces); type_t *type_apicontract_declare(char *name, struct namespace *namespace);

1 0

Rémi Bernon : widl: Fold aIDENTIFIER / aKNOWNTYPE rules together.
by Alexandre Julliard 05 Feb '21

05 Feb '21

Module: wine Branch: master Commit: 36597eda3df66a4b24b341e7ed85d92eecb3b688 URL: https://source.winehq.org/git/wine.git/?a=commit;h=36597eda3df66a4b24b341e7… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Feb 5 10:11:04 2021 +0100 widl: Fold aIDENTIFIER / aKNOWNTYPE rules together. Splitting t_ident rule as typename / m_typename rules. 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/parser.y | 55 +++++++++++++++++++++-------------------------------- 1 file changed, 22 insertions(+), 33 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 782ed39643c..2d527805c14 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -305,7 +305,8 @@ static typelib_t *current_typelib; %type <type> apicontract apicontract_def %type <num> contract_ver %type <num> pointer_type threading_type marshaling_behavior version -%type <str> libraryhdr callconv cppquote importlib import t_ident +%type <str> libraryhdr callconv cppquote importlib import +%type <str> typename m_typename %type <uuid> uuid_string %type <import> import_start %type <typelib> library_start librarydef @@ -459,8 +460,7 @@ importlib: tIMPORTLIB '(' aSTRING ')' semicolon_opt { $$ = $3; if(!parse_only) add_importlib($3, current_typelib); } ; -libraryhdr: tLIBRARY aIDENTIFIER { $$ = $2; } - | tLIBRARY aKNOWNTYPE { $$ = $2; } +libraryhdr: tLIBRARY typename { $$ = $2; } ; library_start: attributes libraryhdr '{' { $$ = make_library($2, check_library_attrs($2, $1)); if (!parse_only && do_typelib) current_typelib = $$; @@ -715,7 +715,7 @@ enum: enum_member '=' expr_int_const { $$ = reg_const($1); } ; -enumdef: tENUM t_ident '{' enums '}' { $$ = type_new_enum($2, current_namespace, TRUE, $4); } +enumdef: tENUM m_typename '{' enums '}' { $$ = type_new_enum($2, current_namespace, TRUE, $4); } ; m_exprs: m_expr { $$ = append_expr( NULL, $1 ); } @@ -847,14 +847,15 @@ m_ident: { $$ = NULL; } | ident ; -t_ident: { $$ = NULL; } - | aIDENTIFIER { $$ = $1; } - | aKNOWNTYPE { $$ = $1; } +m_typename: { $$ = NULL; } + | typename ; -ident: aIDENTIFIER { $$ = make_var($1); } -/* some "reserved words" used in attributes are also used as field names in some MS IDL files */ - | aKNOWNTYPE { $$ = make_var($<str>1); } +typename: aIDENTIFIER + | aKNOWNTYPE + ; + +ident: typename { $$ = make_var($1); } ; base_type: tBYTE { $$ = find_type_or_error($<str>1); } @@ -895,26 +896,21 @@ qualified_type: | aNAMESPACE '.' { init_lookup_namespace($1); } qualified_seq { $$ = $4; } ; -coclass: tCOCLASS aIDENTIFIER { $$ = type_coclass_declare($2); } - | tCOCLASS aKNOWNTYPE { $$ = type_coclass_declare($2); } +coclass: tCOCLASS typename { $$ = type_coclass_declare($2); } ; coclassdef: attributes coclass '{' class_interfaces '}' semicolon_opt { $$ = type_coclass_define($2, $1, $4); } ; -runtimeclass: - tRUNTIMECLASS aIDENTIFIER { $$ = type_runtimeclass_declare($2, current_namespace); } - | tRUNTIMECLASS aKNOWNTYPE { $$ = type_runtimeclass_declare($2, current_namespace); } +runtimeclass: tRUNTIMECLASS typename { $$ = type_runtimeclass_declare($2, current_namespace); } ; runtimeclass_def: attributes runtimeclass '{' class_interfaces '}' semicolon_opt { $$ = type_runtimeclass_define($2, $1, $4); } ; -apicontract: - tAPICONTRACT aIDENTIFIER { $$ = type_apicontract_declare($2, current_namespace); } - | tAPICONTRACT aKNOWNTYPE { $$ = type_apicontract_declare($2, current_namespace); } +apicontract: tAPICONTRACT typename { $$ = type_apicontract_declare($2, current_namespace); } ; apicontract_def: attributes apicontract '{' '}' semicolon_opt @@ -933,9 +929,7 @@ class_interface: m_attributes interfaceref ';' { $$ = make_ifref($2); $$->attrs = $1; } ; -dispinterface: - tDISPINTERFACE aIDENTIFIER { $$ = type_dispinterface_declare($2); } - | tDISPINTERFACE aKNOWNTYPE { $$ = type_dispinterface_declare($2); } +dispinterface: tDISPINTERFACE typename { $$ = type_dispinterface_declare($2); } ; dispattributes: attributes { $$ = append_attr($1, make_attr(ATTR_DISPINTERFACE)); } @@ -960,9 +954,7 @@ inherit: { $$ = NULL; } | ':' qualified_type { $$ = $2; } ; -interface: - tINTERFACE aIDENTIFIER { $$ = type_interface_declare($2, current_namespace); } - | tINTERFACE aKNOWNTYPE { $$ = type_interface_declare($2, current_namespace); } +interface: tINTERFACE typename { $$ = type_interface_declare($2, current_namespace); } ; interfacedef: attributes interface inherit @@ -978,14 +970,11 @@ interfacedef: attributes interface inherit ; interfaceref: - tINTERFACE aIDENTIFIER { $$ = get_type(TYPE_INTERFACE, $2, current_namespace, 0); } - | tINTERFACE aKNOWNTYPE { $$ = get_type(TYPE_INTERFACE, $2, current_namespace, 0); } - | tDISPINTERFACE aIDENTIFIER { $$ = get_type(TYPE_INTERFACE, $2, current_namespace, 0); } - | tDISPINTERFACE aKNOWNTYPE { $$ = get_type(TYPE_INTERFACE, $2, current_namespace, 0); } + tINTERFACE typename { $$ = get_type(TYPE_INTERFACE, $2, current_namespace, 0); } + | tDISPINTERFACE typename { $$ = get_type(TYPE_INTERFACE, $2, current_namespace, 0); } ; -module: tMODULE aIDENTIFIER { $$ = type_module_declare($2); } - | tMODULE aKNOWNTYPE { $$ = type_module_declare($2); } +module: tMODULE typename { $$ = type_module_declare($2); } ; moduledef: attributes module '{' int_statements '}' semicolon_opt @@ -1153,7 +1142,7 @@ pointer_type: | tPTR { $$ = FC_FP; } ; -structdef: tSTRUCT t_ident '{' fields '}' { $$ = type_new_struct($2, current_namespace, TRUE, $4); } +structdef: tSTRUCT m_typename '{' fields '}' { $$ = type_new_struct($2, current_namespace, TRUE, $4); } ; type: tVOID { $$ = type_new_void(); } @@ -1175,9 +1164,9 @@ typedef: m_attributes tTYPEDEF m_attributes decl_spec declarator_list } ; -uniondef: tUNION t_ident '{' ne_union_fields '}' +uniondef: tUNION m_typename '{' ne_union_fields '}' { $$ = type_new_nonencapsulated_union($2, TRUE, $4); } - | tUNION t_ident + | tUNION m_typename tSWITCH '(' s_field ')' m_ident '{' cases '}' { $$ = type_new_encapsulated_union($2, $5, $7, $9); } ;

1 0

Henri Verbeet : wined3d: Invalidate STATE_STENCIL_REF when switching between NULL and non-NULL depth/stencil views.
by Alexandre Julliard 05 Feb '21

05 Feb '21

Module: wine Branch: master Commit: 08dc5b92e02536a173b19da5fba6788f492410e0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=08dc5b92e02536a173b19da5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Feb 5 11:37:16 2021 +0100 wined3d: Invalidate STATE_STENCIL_REF when switching between NULL and non-NULL depth/stencil views. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 1dfc881905b..0385b8f4693 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -1229,6 +1229,7 @@ static void wined3d_cs_exec_set_depth_stencil_view(struct wined3d_cs *cs, const { /* Swapping NULL / non NULL depth stencil affects the depth and tests */ device_invalidate_state(device, STATE_DEPTH_STENCIL); + device_invalidate_state(device, STATE_STENCIL_REF); device_invalidate_state(device, STATE_RASTERIZER); } else if (prev)

1 0

Piotr Caban : msvcrt: Set mxcsr denormal flag in sqrtf if needed.
by Alexandre Julliard 05 Feb '21

05 Feb '21

Module: wine Branch: master Commit: 0cd71776f474a6d8df7dc1198c50a3c31bacb635 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0cd71776f474a6d8df7dc119… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Feb 5 16:06:47 2021 +0100 msvcrt: Set mxcsr denormal flag in sqrtf if needed. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 85 ++++++++++++++++++++++++++++++++++-------------------- 1 file changed, 53 insertions(+), 32 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 0f41cbac468..d0cc87d2c8e 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -82,6 +82,13 @@ static inline float fp_barrierf(float x) return y; } +static inline double CDECL ret_nan( BOOL update_sw ) +{ + double x = 1.0; + if (!update_sw) return -NAN; + return (x - x) / (x - x); +} + /********************************************************************* * _matherr (CRTDLL.@) */ @@ -613,6 +620,28 @@ float CDECL sinhf( float x ) return ret; } +static BOOL sqrtf_validate( float *x ) +{ + short c = _fdclass(*x); + + if (c == FP_ZERO) return FALSE; + if (c == FP_NAN) return FALSE; + if (signbit(*x)) + { + *x = math_error(_DOMAIN, "sqrtf", *x, 0, ret_nan(TRUE)); + return FALSE; + } + if (c == FP_INFINITE) return FALSE; + return TRUE; +} + +#if defined(__x86_64__) || defined(__i386__) +float CDECL sse2_sqrtf(float); +__ASM_GLOBAL_FUNC( sse2_sqrtf, + "sqrtss %xmm0, %xmm0\n\t" + "ret" ) +#endif + /********************************************************************* * sqrtf (MSVCRT.@) * @@ -620,25 +649,23 @@ float CDECL sinhf( float x ) */ float CDECL sqrtf( float x ) { +#ifdef __x86_64__ + if (!sqrtf_validate(&x)) + return x; + + return sse2_sqrtf(x); +#else static const float tiny = 1.0e-30; float z; - int sign = 0x80000000; int ix,s,q,m,t,i; unsigned int r; ix = *(int*)&x; - /* take care of Inf and NaN */ - if ((ix & 0x7f800000) == 0x7f800000 && (ix == 0x7f800000 || ix & 0x7fffff)) + if (!sqrtf_validate(&x)) return x; - /* take care of zero */ - if (ix <= 0) { - if ((ix & ~sign) == 0) - return x; /* sqrt(+-0) = +-0 */ - return math_error(_DOMAIN, "sqrtf", x, 0, (x - x) / (x - x)); /* sqrt(-ve) = sNaN */ - } /* normalize x */ m = ix >> 23; if (m == 0) { /* subnormal x */ @@ -683,6 +710,7 @@ float CDECL sqrtf( float x ) r = ix + ((unsigned int)m << 23); z = *(float*)&r; return z; +#endif } /********************************************************************* @@ -1165,14 +1193,7 @@ double CDECL sinh( double x ) return ret; } -static inline double CDECL ret_nan( BOOL update_sw ) -{ - double x = 1.0; - if (!update_sw) return -NAN; - return (x - x) / (x - x); -} - -BOOL sqrt_validate( double *x, BOOL update_sw ) +static BOOL sqrt_validate( double *x, BOOL update_sw ) { short c = _dclass(*x); @@ -3511,6 +3532,21 @@ __int64 CDECL llrintf(float x) return unix_funcs->llrintf( x ); } +/********************************************************************* + * _fdclass (MSVCR120.@) + * + * Copied from musl: src/math/__fpclassifyf.c + */ +short CDECL _fdclass(float x) +{ + union { float f; UINT32 i; } u = { x }; + int e = u.i >> 23 & 0xff; + + if (!e) return u.i << 1 ? FP_SUBNORMAL : FP_ZERO; + if (e == 0xff) return u.i << 9 ? FP_NAN : FP_INFINITE; + return FP_NORMAL; +} + /********************************************************************* * _dclass (MSVCR120.@) * @@ -3592,21 +3628,6 @@ float CDECL truncf(float x) return unix_funcs->truncf(x); } -/********************************************************************* - * _fdclass (MSVCR120.@) - * - * Copied from musl: src/math/__fpclassifyf.c - */ -short CDECL _fdclass(float x) -{ - union { float f; UINT32 i; } u = { x }; - int e = u.i >> 23 & 0xff; - - if (!e) return u.i << 1 ? FP_SUBNORMAL : FP_ZERO; - if (e == 0xff) return u.i << 9 ? FP_NAN : FP_INFINITE; - return FP_NORMAL; -} - /********************************************************************* * _dtest (MSVCR120.@) */

1 0

Piotr Caban : msvcrt: Disable sse2 math functions in older versions of runtime.
by Alexandre Julliard 05 Feb '21

05 Feb '21

Module: wine Branch: master Commit: 4ae82fd0077dcc1ef3a6d07dd2f369c32e1d8ba0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4ae82fd0077dcc1ef3a6d07d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Feb 5 16:06:50 2021 +0100 msvcrt: Disable sse2 math functions in older versions of runtime. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index d0cc87d2c8e..bebd3e2cef9 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -71,7 +71,12 @@ static const struct unix_funcs *unix_funcs; void msvcrt_init_math( void *module ) { - sse2_supported = sse2_enabled = IsProcessorFeaturePresent( PF_XMMI64_INSTRUCTIONS_AVAILABLE ); + sse2_supported = IsProcessorFeaturePresent( PF_XMMI64_INSTRUCTIONS_AVAILABLE ); +#if _MSVCR_VER <=71 + sse2_enabled = FALSE; +#else + sse2_enabled = sse2_supported; +#endif __wine_init_unix_lib( module, DLL_PROCESS_ATTACH, NULL, &unix_funcs ); }

1 0

Piotr Caban : msvcrt: Add x87 asin implementation.
by Alexandre Julliard 05 Feb '21

05 Feb '21

Module: wine Branch: master Commit: a6e3987e5b58cac29f003b20325373deadbd90af URL: https://source.winehq.org/git/wine.git/?a=commit;h=a6e3987e5b58cac29f003b20… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Feb 5 16:07:10 2021 +0100 msvcrt: Add x87 asin implementation. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50429 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 85 +++++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 62 insertions(+), 23 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index bebd3e2cef9..83e5d1e65da 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -94,6 +94,31 @@ static inline double CDECL ret_nan( BOOL update_sw ) return (x - x) / (x - x); } +#define SET_X87_CW(MASK) \ + "subl $4, %esp\n\t" \ + __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") \ + "fnstcw (%esp)\n\t" \ + "movw (%esp), %ax\n\t" \ + "movw %ax, 2(%esp)\n\t" \ + "testw $" #MASK ", %ax\n\t" \ + "jz 1f\n\t" \ + "andw $~" #MASK ", %ax\n\t" \ + "movw %ax, 2(%esp)\n\t" \ + "fldcw 2(%esp)\n\t" \ + "1:\n\t" + +#define RESET_X87_CW \ + "movw (%esp), %ax\n\t" \ + "cmpw %ax, 2(%esp)\n\t" \ + "je 1f\n\t" \ + "fstpl 8(%esp)\n\t" \ + "fldcw (%esp)\n\t" \ + "fldl 8(%esp)\n\t" \ + "fwait\n\t" \ + "1:\n\t" \ + "addl $4, %esp\n\t" \ + __ASM_CFI(".cfi_adjust_cfa_offset -4\n\t") + /********************************************************************* * _matherr (CRTDLL.@) */ @@ -886,6 +911,23 @@ static double asin_R(double z) return p / q; } +#ifdef __i386__ +double CDECL x87_asin(double); +__ASM_GLOBAL_FUNC( x87_asin, + "fldl 4(%esp)\n\t" + SET_X87_CW(~0x37f) + "fld %st\n\t" + "fld1\n\t" + "fsubp\n\t" + "fld1\n\t" + "fadd %st(2)\n\t" + "fmulp\n\t" + "fsqrt\n\t" + "fpatan\n\t" + RESET_X87_CW + "ret" ) +#endif + double CDECL asin( double x ) { static const double pio2_hi = 1.57079632679489655800e+00, @@ -894,6 +936,9 @@ double CDECL asin( double x ) double z, r, s; unsigned int hx, ix; ULONGLONG llx; +#ifdef __i386__ + unsigned int x87_cw, sse2_cw; +#endif hx = *(ULONGLONG*)&x >> 32; ix = hx & 0x7fffffff; @@ -904,9 +949,24 @@ double CDECL asin( double x ) if (((ix - 0x3ff00000) | lx) == 0) /* asin(1) = +-pi/2 with inexact */ return x * pio2_hi + 7.5231638452626401e-37; - if (isnan(x)) return x; + if (isnan(x)) + { +#ifdef __i386__ + return math_error(_DOMAIN, "sqrt", x, 0, x); +#else + return x; +#endif + } return math_error(_DOMAIN, "asin", x, 0, 0 / (x - x)); } + +#ifdef __i386__ + __control87_2(0, 0, &x87_cw, &sse2_cw); + if (!sse2_enabled || (x87_cw & _MCW_EM) != _MCW_EM + || (sse2_cw & (_MCW_EM | _MCW_RC)) != _MCW_EM) + return x87_asin(x); +#endif + /* |x| < 0.5 */ if (ix < 0x3fe00000) { /* if 0x1p-1022 <= |x| < 0x1p-26, avoid raising underflow */ @@ -1231,31 +1291,10 @@ __ASM_GLOBAL_FUNC( sse2_sqrt, #endif #ifdef __i386__ -#define SET_X87_CW \ - "subl $4, %esp\n\t" \ - __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") \ - "fnstcw (%esp)\n\t" \ - "movw (%esp), %ax\n\t" \ - "testw $0xc00, %ax\n\t" \ - "jz 1f\n\t" \ - "andw $0xf3ff, %ax\n\t" \ - "movw %ax, 2(%esp)\n\t" \ - "fldcw 2(%esp)\n\t" \ - "1:\n\t" - -#define RESET_X87_CW \ - "movw (%esp), %ax\n\t" \ - "testw $0xc00, %ax\n\t" \ - "jz 1f\n\t" \ - "fldcw (%esp)\n\t" \ - "1:\n\t" \ - "addl $4, %esp\n\t" \ - __ASM_CFI(".cfi_adjust_cfa_offset -4\n\t") - double CDECL x87_sqrt(double); __ASM_GLOBAL_FUNC( x87_sqrt, "fldl 4(%esp)\n\t" - SET_X87_CW + SET_X87_CW(0xc00) "fsqrt\n\t" RESET_X87_CW "ret" )

1 0

Andrey Gusev : wined3d: Add AMD Radeon RX 5500M.
by Alexandre Julliard 05 Feb '21

05 Feb '21

Module: wine Branch: master Commit: c66e0e5723df466ec8e00c4d1589518efb1eb761 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c66e0e5723df466ec8e00c4d… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Wed Feb 3 20:08:44 2021 +0200 wined3d: Add AMD Radeon RX 5500M. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_gl.c | 3 ++- dlls/wined3d/directx.c | 1 + dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index d9f70049e6f..a9454ee38eb 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -1646,8 +1646,9 @@ cards_intel[] = * drivers: R700, RV790, R680, RV535, RV516, R410, RS485, RV360, RV351. */ cards_amd_mesa[] = { - /* Navi 10 */ + /* Navi 10/14 */ {"NAVI10", CARD_AMD_RADEON_RX_NAVI_10}, + {"NAVI14", CARD_AMD_RADEON_RX_NAVI_14}, /* Polaris 10/11 */ {"POLARIS10", CARD_AMD_RADEON_RX_480}, {"POLARIS11", CARD_AMD_RADEON_RX_460}, diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index f72fd3e3ae3..5c0998ba54c 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -513,6 +513,7 @@ static const struct wined3d_gpu_description gpu_description_table[] = {HW_VENDOR_AMD, CARD_AMD_RADEON_RAVEN, "AMD Radeon(TM) Vega 10 Mobile Graphics", DRIVER_AMD_RX, 1024}, {HW_VENDOR_AMD, CARD_AMD_RADEON_RX_VEGA_20, "Radeon RX Vega 20", DRIVER_AMD_RX, 4096}, {HW_VENDOR_AMD, CARD_AMD_RADEON_RX_NAVI_10, "Radeon RX 5700 / 5700 XT", DRIVER_AMD_RX, 8192}, + {HW_VENDOR_AMD, CARD_AMD_RADEON_RX_NAVI_14, "Radeon RX 5500M", DRIVER_AMD_RX, 4096}, /* Red Hat */ {HW_VENDOR_REDHAT, CARD_REDHAT_VIRGL, "Red Hat VirtIO GPU", DRIVER_REDHAT_VIRGL, 1024}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e9607edb971..bb68b780c7d 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2894,6 +2894,7 @@ enum wined3d_pci_device CARD_AMD_RADEON_RAVEN = 0x15dd, CARD_AMD_RADEON_RX_VEGA_20 = 0x66af, CARD_AMD_RADEON_RX_NAVI_10 = 0x731f, + CARD_AMD_RADEON_RX_NAVI_14 = 0x7340, CARD_NVIDIA_RIVA_128 = 0x0018, CARD_NVIDIA_RIVA_TNT = 0x0020,

1 0

Georg Lehmann : winevulkan: Fix vkDestroyDebugUtilsMessengerEXT with NULL object.
by Alexandre Julliard 05 Feb '21

05 Feb '21

Module: wine Branch: master Commit: ffd58f6275101bcf7bc5ef5bd433123460ad0f4f URL: https://source.winehq.org/git/wine.git/?a=commit;h=ffd58f6275101bcf7bc5ef5b… Author: Georg Lehmann <dadschoorse(a)gmail.com> Date: Wed Feb 3 21:13:34 2021 +0100 winevulkan: Fix vkDestroyDebugUtilsMessengerEXT with NULL object. Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/vulkan.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index 2a503a7430d..640b3ee7b67 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -1940,6 +1940,9 @@ void WINAPI wine_vkDestroyDebugUtilsMessengerEXT( object = wine_debug_utils_messenger_from_handle(messenger); + if (!object) + return; + instance->funcs.p_vkDestroyDebugUtilsMessengerEXT(instance->instance, object->debug_messenger, NULL); WINE_VK_REMOVE_HANDLE_MAPPING(instance, object);

1 0

Georg Lehmann : winevulkan: Fix vkDestroyDebugReportCallbackEXT with NULL object.
by Alexandre Julliard 05 Feb '21

05 Feb '21

Module: wine Branch: master Commit: 4f1b297a14bbd304fb20da7c4b64266c14d110e5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4f1b297a14bbd304fb20da7c… Author: Georg Lehmann <dadschoorse(a)gmail.com> Date: Wed Feb 3 21:13:35 2021 +0100 winevulkan: Fix vkDestroyDebugReportCallbackEXT with NULL object. Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/vulkan.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index 640b3ee7b67..a7f5462c432 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -2045,6 +2045,9 @@ void WINAPI wine_vkDestroyDebugReportCallbackEXT( object = wine_debug_report_callback_from_handle(callback); + if (!object) + return; + instance->funcs.p_vkDestroyDebugReportCallbackEXT(instance->instance, object->debug_callback, NULL); WINE_VK_REMOVE_HANDLE_MAPPING(instance, object);

1 0

Zebediah Figura : winegstreamer: Store the wg_parser pointer as our source pad's private data.
by Alexandre Julliard 05 Feb '21

05 Feb '21

Module: wine Branch: master Commit: a2ce39394e2f785b2ea89f5a9592014626e96ea1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a2ce39394e2f785b2ea89f5a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Feb 4 20:53:37 2021 -0600 winegstreamer: Store the wg_parser pointer as our source pad's private data. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 35 +++++++++++++++-------------------- 1 file changed, 15 insertions(+), 20 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 45bd2f9a4a9..31f0a07d93f 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -636,9 +636,8 @@ static gboolean query_sink(GstPad *pad, GstObject *parent, GstQuery *query) } } -static gboolean gst_base_src_perform_seek(struct parser *This, GstEvent *event) +static gboolean gst_base_src_perform_seek(struct wg_parser *parser, GstEvent *event) { - struct wg_parser *parser = This->wg_parser; gboolean res = TRUE; gdouble rate; GstFormat seek_format; @@ -687,15 +686,15 @@ static gboolean gst_base_src_perform_seek(struct parser *This, GstEvent *event) static gboolean event_src(GstPad *pad, GstObject *parent, GstEvent *event) { - struct parser *This = gst_pad_get_element_private(pad); + struct wg_parser *parser = gst_pad_get_element_private(pad); gboolean ret = TRUE; - GST_LOG("filter %p, type \"%s\".", This, GST_EVENT_TYPE_NAME(event)); + GST_LOG("parser %p, type \"%s\".", parser, GST_EVENT_TYPE_NAME(event)); switch (event->type) { case GST_EVENT_SEEK: - ret = gst_base_src_perform_seek(This, event); + ret = gst_base_src_perform_seek(parser, event); break; case GST_EVENT_FLUSH_START: @@ -848,10 +847,9 @@ static gboolean event_sink(GstPad *pad, GstObject *parent, GstEvent *event) static GstFlowReturn request_buffer_src(GstPad *pad, GstObject *parent, guint64 offset, guint size, GstBuffer **buffer); -static void *push_data(void *iface) +static void *push_data(void *arg) { - struct parser *This = iface; - struct wg_parser *parser = This->wg_parser; + struct wg_parser *parser = arg; GstBuffer *buffer; LONGLONG maxlen; @@ -1125,8 +1123,7 @@ static DWORD CALLBACK stream_thread(void *arg) static GstFlowReturn request_buffer_src(GstPad *pad, GstObject *parent, guint64 offset, guint size, GstBuffer **buffer) { - struct parser *filter = gst_pad_get_element_private(pad); - struct wg_parser *parser = filter->wg_parser; + struct wg_parser *parser = gst_pad_get_element_private(pad); GstBuffer *new_buffer = NULL; GstFlowReturn ret; @@ -1414,11 +1411,10 @@ static void existing_new_pad(GstElement *bin, GstPad *pad, gpointer user) static gboolean query_function(GstPad *pad, GstObject *parent, GstQuery *query) { - struct parser *This = gst_pad_get_element_private(pad); - struct wg_parser *parser = This->wg_parser; + struct wg_parser *parser = gst_pad_get_element_private(pad); GstFormat format; - GST_LOG("filter %p, type %s.", This, GST_QUERY_TYPE_NAME(query)); + GST_LOG("parser %p, type %s.", parser, GST_QUERY_TYPE_NAME(query)); switch (GST_QUERY_TYPE(query)) { case GST_QUERY_DURATION: @@ -1456,8 +1452,7 @@ static gboolean query_function(GstPad *pad, GstObject *parent, GstQuery *query) static gboolean activate_push(GstPad *pad, gboolean activate) { - struct parser *This = gst_pad_get_element_private(pad); - struct wg_parser *parser = This->wg_parser; + struct wg_parser *parser = gst_pad_get_element_private(pad); if (!activate) { if (parser->push_thread) { @@ -1467,7 +1462,7 @@ static gboolean activate_push(GstPad *pad, gboolean activate) } else if (!parser->push_thread) { int ret; - if ((ret = pthread_create(&parser->push_thread, NULL, push_data, This))) + if ((ret = pthread_create(&parser->push_thread, NULL, push_data, parser))) { GST_ERROR("Failed to create push thread: %s", strerror(errno)); parser->push_thread = 0; @@ -1479,10 +1474,10 @@ static gboolean activate_push(GstPad *pad, gboolean activate) static gboolean activate_mode(GstPad *pad, GstObject *parent, GstPadMode mode, gboolean activate) { - struct parser *filter = gst_pad_get_element_private(pad); + struct wg_parser *parser = gst_pad_get_element_private(pad); - GST_DEBUG("%s source pad for filter %p in %s mode.", - activate ? "Activating" : "Deactivating", filter, gst_pad_mode_get_name(mode)); + GST_DEBUG("%s source pad for parser %p in %s mode.", + activate ? "Activating" : "Deactivating", parser, gst_pad_mode_get_name(mode)); switch (mode) { case GST_PAD_MODE_PULL: @@ -1625,7 +1620,7 @@ static HRESULT GST_Connect(struct parser *This, IPin *pConnectPin) gst_pad_set_query_function(parser->my_src, query_function); gst_pad_set_activatemode_function(parser->my_src, activate_mode); gst_pad_set_event_function(parser->my_src, event_src); - gst_pad_set_element_private (parser->my_src, This); + gst_pad_set_element_private(parser->my_src, parser); parser->start_offset = parser->next_offset = parser->stop_offset = 0; This->next_pull_offset = 0;

1 0