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

Piotr Caban : msvcrt: Import neabyintf implementation from musl.
by Alexandre Julliard 14 May '21

14 May '21

Module: wine Branch: master Commit: 2caca437332b95ec807dd6195ac4bd4df616f934 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2caca437332b95ec807dd619… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri May 14 16:11:44 2021 +0200 msvcrt: Import neabyintf implementation from musl. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 - configure.ac | 1 - dlls/msvcrt/math.c | 13 +++++++++++-- dlls/msvcrt/unixlib.c | 13 ------------- dlls/msvcrt/unixlib.h | 1 - include/config.h.in | 3 --- 6 files changed, 11 insertions(+), 21 deletions(-) diff --git a/configure b/configure index b6964befcc5..91f0c586c60 100755 --- a/configure +++ b/configure @@ -19641,7 +19641,6 @@ for ac_func in \ log2 \ log2f \ nearbyint \ - nearbyintf \ nexttoward \ nexttowardf \ remainder \ diff --git a/configure.ac b/configure.ac index 2e809c2e1f0..df1025aeb98 100644 --- a/configure.ac +++ b/configure.ac @@ -2681,7 +2681,6 @@ AC_CHECK_FUNCS(\ log2 \ log2f \ nearbyint \ - nearbyintf \ nexttoward \ nexttowardf \ remainder \ diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 2e827dd32c6..7fe7b9d172b 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -3426,10 +3426,19 @@ double CDECL nearbyint(double num) /********************************************************************* * _nearbyintf (MSVCR120.@) + * + * Based on musl: src/math/nearbyteintf.c */ -float CDECL nearbyintf(float num) +float CDECL nearbyintf(float x) { - return unix_funcs->nearbyintf( num ); + fenv_t env; + + fegetenv(&env); + _control87(_MCW_EM, _MCW_EM); + x = rintf(x); + feclearexcept(FE_INEXACT); + feupdateenv(&env); + return x; } /********************************************************************* diff --git a/dlls/msvcrt/unixlib.c b/dlls/msvcrt/unixlib.c index 282c11166f5..a0892e98d97 100644 --- a/dlls/msvcrt/unixlib.c +++ b/dlls/msvcrt/unixlib.c @@ -559,18 +559,6 @@ static double CDECL unix_nearbyint(double num) #endif } -/********************************************************************* - * nearbyintf - */ -static float CDECL unix_nearbyintf(float num) -{ -#ifdef HAVE_NEARBYINTF - return nearbyintf(num); -#else - return unix_nearbyint(num); -#endif -} - /********************************************************************* * nextafter */ @@ -847,7 +835,6 @@ static const struct unix_funcs funcs = unix_modf, unix_modff, unix_nearbyint, - unix_nearbyintf, unix_nextafter, unix_nextafterf, unix_nexttoward, diff --git a/dlls/msvcrt/unixlib.h b/dlls/msvcrt/unixlib.h index 6ce85c194ac..d8b5e6b3f24 100644 --- a/dlls/msvcrt/unixlib.h +++ b/dlls/msvcrt/unixlib.h @@ -73,7 +73,6 @@ struct unix_funcs double (CDECL *modf)(double x, double *iptr); float (CDECL *modff)(float x, float *iptr); double (CDECL *nearbyint)(double num); - float (CDECL *nearbyintf)(float num); double (CDECL *nextafter)(double x, double y); float (CDECL *nextafterf)(float x, float y); double (CDECL *nexttoward)(double x, double y); diff --git a/include/config.h.in b/include/config.h.in index 2fc36aa7eda..896d44cd71e 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -504,9 +504,6 @@ /* Define to 1 if you have the `nearbyint' function. */ #undef HAVE_NEARBYINT -/* Define to 1 if you have the `nearbyintf' function. */ -#undef HAVE_NEARBYINTF - /* Define to 1 if you have the <netdb.h> header file. */ #undef HAVE_NETDB_H

1 0

Piotr Caban : msvcrt: Import neabyint implementation from musl.
by Alexandre Julliard 14 May '21

14 May '21

Module: wine Branch: master Commit: 854a3cab4c136d3e2292bcd9c42c530e56cef7e9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=854a3cab4c136d3e2292bcd9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri May 14 16:11:48 2021 +0200 msvcrt: Import neabyint implementation from musl. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 - configure.ac | 1 - dlls/msvcrt/math.c | 13 +++++++++++-- dlls/msvcrt/unixlib.c | 13 ------------- dlls/msvcrt/unixlib.h | 1 - include/config.h.in | 3 --- 6 files changed, 11 insertions(+), 21 deletions(-) diff --git a/configure b/configure index 91f0c586c60..525d585130f 100755 --- a/configure +++ b/configure @@ -19640,7 +19640,6 @@ for ac_func in \ log1pf \ log2 \ log2f \ - nearbyint \ nexttoward \ nexttowardf \ remainder \ diff --git a/configure.ac b/configure.ac index df1025aeb98..2e8ff20aeef 100644 --- a/configure.ac +++ b/configure.ac @@ -2680,7 +2680,6 @@ AC_CHECK_FUNCS(\ log1pf \ log2 \ log2f \ - nearbyint \ nexttoward \ nexttowardf \ remainder \ diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 7fe7b9d172b..2bc51213a07 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -3418,10 +3418,19 @@ double CDECL _yn(int n, double x) /********************************************************************* * _nearbyint (MSVCR120.@) + * + * Based on musl: src/math/nearbyteint.c */ -double CDECL nearbyint(double num) +double CDECL nearbyint(double x) { - return unix_funcs->nearbyint( num ); + fenv_t env; + + fegetenv(&env); + _control87(_MCW_EM, _MCW_EM); + x = rint(x); + feclearexcept(FE_INEXACT); + feupdateenv(&env); + return x; } /********************************************************************* diff --git a/dlls/msvcrt/unixlib.c b/dlls/msvcrt/unixlib.c index a0892e98d97..376bdb5c1c7 100644 --- a/dlls/msvcrt/unixlib.c +++ b/dlls/msvcrt/unixlib.c @@ -547,18 +547,6 @@ static float CDECL unix_modff( float x, float *iptr ) return modff( x, iptr ); } -/********************************************************************* - * nearbyint - */ -static double CDECL unix_nearbyint(double num) -{ -#ifdef HAVE_NEARBYINT - return nearbyint(num); -#else - return num >= 0 ? floor(num + 0.5) : ceil(num - 0.5); -#endif -} - /********************************************************************* * nextafter */ @@ -834,7 +822,6 @@ static const struct unix_funcs funcs = unix_logbf, unix_modf, unix_modff, - unix_nearbyint, unix_nextafter, unix_nextafterf, unix_nexttoward, diff --git a/dlls/msvcrt/unixlib.h b/dlls/msvcrt/unixlib.h index d8b5e6b3f24..ecdbdf0cca1 100644 --- a/dlls/msvcrt/unixlib.h +++ b/dlls/msvcrt/unixlib.h @@ -72,7 +72,6 @@ struct unix_funcs float (CDECL *logbf)(float x); double (CDECL *modf)(double x, double *iptr); float (CDECL *modff)(float x, float *iptr); - double (CDECL *nearbyint)(double num); double (CDECL *nextafter)(double x, double y); float (CDECL *nextafterf)(float x, float y); double (CDECL *nexttoward)(double x, double y); diff --git a/include/config.h.in b/include/config.h.in index 896d44cd71e..a638c0382c9 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -501,9 +501,6 @@ /* Define if MTLDevice protocol has registryID property. */ #undef HAVE_MTLDEVICE_REGISTRYID -/* Define to 1 if you have the `nearbyint' function. */ -#undef HAVE_NEARBYINT - /* Define to 1 if you have the <netdb.h> header file. */ #undef HAVE_NETDB_H

1 0

Piotr Caban : msvcrt: Import nextafter implementation from musl.
by Alexandre Julliard 14 May '21

14 May '21

Module: wine Branch: master Commit: f041eeab266bb6e7955fad7675c61ca0c2981b25 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f041eeab266bb6e7955fad76… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri May 14 16:11:50 2021 +0200 msvcrt: Import nextafter implementation from musl. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 45 ++++++++++++++++++++++++++++++++++++++------- dlls/msvcrt/unixlib.c | 9 --------- dlls/msvcrt/unixlib.h | 1 - 3 files changed, 38 insertions(+), 17 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 2bc51213a07..b682e72ab76 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -87,13 +87,11 @@ static inline float fp_barrierf(float x) return y; } -#if _MSVCR_VER>=120 static inline double fp_barrier(double x) { volatile double y = x; return y; } -#endif static inline double CDECL ret_nan( BOOL update_sw ) { @@ -3482,13 +3480,46 @@ float CDECL MSVCRT_nexttowardf(float num, double next) /********************************************************************* * _nextafter (MSVCRT.@) + * + * Copied from musl: src/math/nextafter.c */ -double CDECL _nextafter(double num, double next) +double CDECL _nextafter(double x, double y) { - double retval; - if (!isfinite(num) || !isfinite(next)) *_errno() = EDOM; - retval = unix_funcs->nextafter(num,next); - return retval; + ULONGLONG llx = *(ULONGLONG*)&x; + ULONGLONG lly = *(ULONGLONG*)&y; + ULONGLONG ax, ay; + int e; + + if (isnan(x) || isnan(y)) + return x + y; + if (llx == lly) { + if (_fpclass(y) & (_FPCLASS_ND | _FPCLASS_PD | _FPCLASS_NZ | _FPCLASS_PZ )) + *_errno() = ERANGE; + return y; + } + ax = llx & -1ULL / 2; + ay = lly & -1ULL / 2; + if (ax == 0) { + if (ay == 0) + return y; + llx = (lly & 1ULL << 63) | 1; + } else if (ax > ay || ((llx ^ lly) & 1ULL << 63)) + llx--; + else + llx++; + e = llx >> 52 & 0x7ff; + /* raise overflow if llx is infinite and x is finite */ + if (e == 0x7ff) { + fp_barrier(x + x); + *_errno() = ERANGE; + } + /* raise underflow if llx is subnormal or zero */ + y = *(double*)&llx; + if (e == 0) { + fp_barrier(x * x + y * y); + *_errno() = ERANGE; + } + return y; } /********************************************************************* diff --git a/dlls/msvcrt/unixlib.c b/dlls/msvcrt/unixlib.c index 376bdb5c1c7..931c8a2412b 100644 --- a/dlls/msvcrt/unixlib.c +++ b/dlls/msvcrt/unixlib.c @@ -547,14 +547,6 @@ static float CDECL unix_modff( float x, float *iptr ) return modff( x, iptr ); } -/********************************************************************* - * nextafter - */ -static double CDECL unix_nextafter(double num, double next) -{ - return nextafter(num,next); -} - /********************************************************************* * nextafterf */ @@ -822,7 +814,6 @@ static const struct unix_funcs funcs = unix_logbf, unix_modf, unix_modff, - unix_nextafter, unix_nextafterf, unix_nexttoward, unix_nexttowardf, diff --git a/dlls/msvcrt/unixlib.h b/dlls/msvcrt/unixlib.h index ecdbdf0cca1..1c43253f746 100644 --- a/dlls/msvcrt/unixlib.h +++ b/dlls/msvcrt/unixlib.h @@ -72,7 +72,6 @@ struct unix_funcs float (CDECL *logbf)(float x); double (CDECL *modf)(double x, double *iptr); float (CDECL *modff)(float x, float *iptr); - double (CDECL *nextafter)(double x, double y); float (CDECL *nextafterf)(float x, float y); double (CDECL *nexttoward)(double x, double y); float (CDECL *nexttowardf)(float x, double y);

1 0

Piotr Caban : msvcrt: Import nextafterf implementation from musl.
by Alexandre Julliard 14 May '21

14 May '21

Module: wine Branch: master Commit: 1dc3aa808fc65347fb12d32b05194c05748110be URL: https://source.winehq.org/git/wine.git/?a=commit;h=1dc3aa808fc65347fb12d32b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri May 14 16:11:55 2021 +0200 msvcrt: Import nextafterf implementation from musl. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 40 +++++++++++++++++++++++++++++++++++++--- dlls/msvcrt/unixlib.c | 9 --------- dlls/msvcrt/unixlib.h | 1 - 3 files changed, 37 insertions(+), 13 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index b682e72ab76..77018e27cf5 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -234,11 +234,45 @@ float CDECL _copysignf( float x, float y ) /********************************************************************* * _nextafterf (MSVCRT.@) + * + * Copied from musl: src/math/nextafterf.c */ -float CDECL _nextafterf( float num, float next ) +float CDECL _nextafterf( float x, float y ) { - if (!isfinite(num) || !isfinite(next)) *_errno() = EDOM; - return unix_funcs->nextafterf( num, next ); + unsigned int ix = *(unsigned int*)&x; + unsigned int iy = *(unsigned int*)&y; + unsigned int ax, ay, e; + + if (isnan(x) || isnan(y)) + return x + y; + if (x == y) { + if (_fpclassf(y) & (_FPCLASS_ND | _FPCLASS_PD | _FPCLASS_NZ | _FPCLASS_PZ )) + *_errno() = ERANGE; + return y; + } + ax = ix & 0x7fffffff; + ay = iy & 0x7fffffff; + if (ax == 0) { + if (ay == 0) + return y; + ix = (iy & 0x80000000) | 1; + } else if (ax > ay || ((ix ^ iy) & 0x80000000)) + ix--; + else + ix++; + e = ix & 0x7f800000; + /* raise overflow if ix is infinite and x is finite */ + if (e == 0x7f800000) { + fp_barrierf(x + x); + *_errno() = ERANGE; + } + /* raise underflow if ix is subnormal or zero */ + y = *(float*)&ix; + if (e == 0) { + fp_barrierf(x * x + y * y); + *_errno() = ERANGE; + } + return y; } /********************************************************************* diff --git a/dlls/msvcrt/unixlib.c b/dlls/msvcrt/unixlib.c index 931c8a2412b..c36d5a2caad 100644 --- a/dlls/msvcrt/unixlib.c +++ b/dlls/msvcrt/unixlib.c @@ -547,14 +547,6 @@ static float CDECL unix_modff( float x, float *iptr ) return modff( x, iptr ); } -/********************************************************************* - * nextafterf - */ -static float CDECL unix_nextafterf(float num, float next) -{ - return nextafterf(num,next); -} - /********************************************************************* * nexttoward */ @@ -814,7 +806,6 @@ static const struct unix_funcs funcs = unix_logbf, unix_modf, unix_modff, - unix_nextafterf, unix_nexttoward, unix_nexttowardf, unix_pow, diff --git a/dlls/msvcrt/unixlib.h b/dlls/msvcrt/unixlib.h index 1c43253f746..1a8807b8495 100644 --- a/dlls/msvcrt/unixlib.h +++ b/dlls/msvcrt/unixlib.h @@ -72,7 +72,6 @@ struct unix_funcs float (CDECL *logbf)(float x); double (CDECL *modf)(double x, double *iptr); float (CDECL *modff)(float x, float *iptr); - float (CDECL *nextafterf)(float x, float y); double (CDECL *nexttoward)(double x, double y); float (CDECL *nexttowardf)(float x, double y); double (CDECL *pow)(double x, double y);

1 0

Piotr Caban : msvcrt: Call nextafter in nexttoward implementation.
by Alexandre Julliard 14 May '21

14 May '21

Module: wine Branch: master Commit: ac4e67597301d2d2e73174df5397eb07b01bb3f1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ac4e67597301d2d2e73174df… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri May 14 16:11:59 2021 +0200 msvcrt: Call nextafter in nexttoward implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 - configure.ac | 1 - dlls/msvcrt/math.c | 8 +------- dlls/msvcrt/unixlib.c | 14 -------------- dlls/msvcrt/unixlib.h | 1 - include/config.h.in | 3 --- 6 files changed, 1 insertion(+), 27 deletions(-) diff --git a/configure b/configure index 525d585130f..ae7f66fb034 100755 --- a/configure +++ b/configure @@ -19640,7 +19640,6 @@ for ac_func in \ log1pf \ log2 \ log2f \ - nexttoward \ nexttowardf \ remainder \ remainderf \ diff --git a/configure.ac b/configure.ac index 2e8ff20aeef..626c7674686 100644 --- a/configure.ac +++ b/configure.ac @@ -2680,7 +2680,6 @@ AC_CHECK_FUNCS(\ log1pf \ log2 \ log2f \ - nexttoward \ nexttowardf \ remainder \ remainderf \ diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 77018e27cf5..6e32021373a 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -3487,13 +3487,7 @@ float CDECL nearbyintf(float x) */ double CDECL MSVCRT_nexttoward(double num, double next) { - double ret = unix_funcs->nexttoward(num, next); - if (!(_fpclass(ret) & (_FPCLASS_PN | _FPCLASS_NN - | _FPCLASS_SNAN | _FPCLASS_QNAN)) && !isinf(num)) - { - *_errno() = ERANGE; - } - return ret; + return _nextafter(num, next); } /********************************************************************* diff --git a/dlls/msvcrt/unixlib.c b/dlls/msvcrt/unixlib.c index c36d5a2caad..7c1cb0bd698 100644 --- a/dlls/msvcrt/unixlib.c +++ b/dlls/msvcrt/unixlib.c @@ -547,19 +547,6 @@ static float CDECL unix_modff( float x, float *iptr ) return modff( x, iptr ); } -/********************************************************************* - * nexttoward - */ -static double CDECL unix_nexttoward(double num, double next) -{ -#ifdef HAVE_NEXTTOWARD - return nexttoward(num, next); -#else - FIXME("not implemented\n"); - return 0; -#endif -} - /********************************************************************* * nexttowardf */ @@ -806,7 +793,6 @@ static const struct unix_funcs funcs = unix_logbf, unix_modf, unix_modff, - unix_nexttoward, unix_nexttowardf, unix_pow, unix_powf, diff --git a/dlls/msvcrt/unixlib.h b/dlls/msvcrt/unixlib.h index 1a8807b8495..f30f8d33fca 100644 --- a/dlls/msvcrt/unixlib.h +++ b/dlls/msvcrt/unixlib.h @@ -72,7 +72,6 @@ struct unix_funcs float (CDECL *logbf)(float x); double (CDECL *modf)(double x, double *iptr); float (CDECL *modff)(float x, float *iptr); - double (CDECL *nexttoward)(double x, double y); float (CDECL *nexttowardf)(float x, double y); double (CDECL *pow)(double x, double y); float (CDECL *powf)(float x, float y); diff --git a/include/config.h.in b/include/config.h.in index a638c0382c9..1f2ddbe520f 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -567,9 +567,6 @@ /* Define to 1 if you have the <net/route.h> header file. */ #undef HAVE_NET_ROUTE_H -/* Define to 1 if you have the `nexttoward' function. */ -#undef HAVE_NEXTTOWARD - /* Define to 1 if you have the `nexttowardf' function. */ #undef HAVE_NEXTTOWARDF

1 0

Piotr Caban : msvcrt: Import nexttowardf implementation from musl.
by Alexandre Julliard 14 May '21

14 May '21

Module: wine Branch: master Commit: c12ff71cdcce2e1386e2675ccad62c15dcc7ded3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c12ff71cdcce2e1386e2675c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri May 14 16:12:05 2021 +0200 msvcrt: Import nexttowardf implementation from musl. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 - configure.ac | 1 - dlls/msvcrt/math.c | 41 ++++++++++++++++++++++++++++++++++++----- dlls/msvcrt/unixlib.c | 14 -------------- dlls/msvcrt/unixlib.h | 1 - include/config.h.in | 3 --- 6 files changed, 36 insertions(+), 25 deletions(-) diff --git a/configure b/configure index ae7f66fb034..886a463a92a 100755 --- a/configure +++ b/configure @@ -19640,7 +19640,6 @@ for ac_func in \ log1pf \ log2 \ log2f \ - nexttowardf \ remainder \ remainderf \ remquo \ diff --git a/configure.ac b/configure.ac index 626c7674686..2b126a7c579 100644 --- a/configure.ac +++ b/configure.ac @@ -2680,7 +2680,6 @@ AC_CHECK_FUNCS(\ log1pf \ log2 \ log2f \ - nexttowardf \ remainder \ remainderf \ remquo \ diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 6e32021373a..41096ded6e4 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -3492,13 +3492,44 @@ double CDECL MSVCRT_nexttoward(double num, double next) /********************************************************************* * nexttowardf (MSVCR120.@) + * + * Copied from musl: src/math/nexttowardf.c */ -float CDECL MSVCRT_nexttowardf(float num, double next) +float CDECL MSVCRT_nexttowardf(float x, double y) { - float ret = unix_funcs->nexttowardf( num, next ); - if (!(_fpclass(ret) & (_FPCLASS_PN | _FPCLASS_NN - | _FPCLASS_SNAN | _FPCLASS_QNAN)) && !isinf(num)) - { + unsigned int ix = *(unsigned int*)&x; + unsigned int e; + float ret; + + if (isnan(x) || isnan(y)) + return x + y; + if (x == y) + return y; + if (x == 0) { + ix = 1; + if (signbit(y)) + ix |= 0x80000000; + } else if (x < y) { + if (signbit(x)) + ix--; + else + ix++; + } else { + if (signbit(x)) + ix++; + else + ix--; + } + e = ix & 0x7f800000; + /* raise overflow if ix is infinite and x is finite */ + if (e == 0x7f800000) { + fp_barrierf(x + x); + *_errno() = ERANGE; + } + ret = *(float*)&ix; + /* raise underflow if ret is subnormal or zero */ + if (e == 0) { + fp_barrierf(x * x + ret * ret); *_errno() = ERANGE; } return ret; diff --git a/dlls/msvcrt/unixlib.c b/dlls/msvcrt/unixlib.c index 7c1cb0bd698..a5b59bc2cf3 100644 --- a/dlls/msvcrt/unixlib.c +++ b/dlls/msvcrt/unixlib.c @@ -547,19 +547,6 @@ static float CDECL unix_modff( float x, float *iptr ) return modff( x, iptr ); } -/********************************************************************* - * nexttowardf - */ -static float CDECL unix_nexttowardf(float num, double next) -{ -#ifdef HAVE_NEXTTOWARDF - return nexttowardf(num, next); -#else - FIXME("not implemented\n"); - return 0; -#endif -} - /********************************************************************* * pow */ @@ -793,7 +780,6 @@ static const struct unix_funcs funcs = unix_logbf, unix_modf, unix_modff, - unix_nexttowardf, unix_pow, unix_powf, unix_remainder, diff --git a/dlls/msvcrt/unixlib.h b/dlls/msvcrt/unixlib.h index f30f8d33fca..3d41967a2a0 100644 --- a/dlls/msvcrt/unixlib.h +++ b/dlls/msvcrt/unixlib.h @@ -72,7 +72,6 @@ struct unix_funcs float (CDECL *logbf)(float x); double (CDECL *modf)(double x, double *iptr); float (CDECL *modff)(float x, float *iptr); - float (CDECL *nexttowardf)(float x, double y); double (CDECL *pow)(double x, double y); float (CDECL *powf)(float x, float y); double (CDECL *remainder)(double x, double y); diff --git a/include/config.h.in b/include/config.h.in index 1f2ddbe520f..56f3bc90003 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -567,9 +567,6 @@ /* Define to 1 if you have the <net/route.h> header file. */ #undef HAVE_NET_ROUTE_H -/* Define to 1 if you have the `nexttowardf' function. */ -#undef HAVE_NEXTTOWARDF - /* Define to 1 if `_msg_ptr' is a member of `ns_msg'. */ #undef HAVE_NS_MSG__MSG_PTR

1 0

Biswapriyo Nath : include: Add more PROPERTYKEY declarations in propkey.h.
by Alexandre Julliard 14 May '21

14 May '21

Module: wine Branch: master Commit: 087aefdcff244000af4c2a13b86487fd87854950 URL: https://source.winehq.org/git/wine.git/?a=commit;h=087aefdcff244000af4c2a13… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Fri May 14 15:54:07 2021 +0530 include: Add more PROPERTYKEY declarations in propkey.h. Signed-off-by: Biswapriyo Nath <nathbappai(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/propkey.h | 79 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 79 insertions(+) diff --git a/include/propkey.h b/include/propkey.h index 7af032c27a9..36c47bc339d 100644 --- a/include/propkey.h +++ b/include/propkey.h @@ -228,6 +228,85 @@ DEFINE_PROPERTYKEY(PKEY_Contact_WebPage, 0xe3e0584c,0xb788,0x4a5a,0xbb,0x20,0x7f DEFINE_PROPERTYKEY(PKEY_Contact_Webpage2, 0x00f63dd8,0x22bd,0x4a5d,0xba,0x34,0x5c,0xb0,0xb9,0xbd,0xcb,0x03,124); DEFINE_PROPERTYKEY(PKEY_Contact_Webpage3, 0x00f63dd8,0x22bd,0x4a5d,0xba,0x34,0x5c,0xb0,0xb9,0xbd,0xcb,0x03,125); +DEFINE_PROPERTYKEY(PKEY_AcquisitionID, 0x65a98875,0x3c80,0x40ab,0xab,0xbc,0xef,0xda,0xf7,0x7d,0xbe,0xe2,100); +DEFINE_PROPERTYKEY(PKEY_ApplicationDefinedProperties, 0xcdbfc167,0x337e,0x41d8,0xaf,0x7c,0x8c,0x09,0x20,0x54,0x29,0xc7,100); +DEFINE_PROPERTYKEY(PKEY_ApplicationName, 0xf29f85e0,0x4ff9,0x1068,0xab,0x91,0x08,0x00,0x2b,0x27,0xb3,0xd9,18); +DEFINE_PROPERTYKEY(PKEY_AppZoneIdentifier, 0x502cfeab,0x47eb,0x459c,0xb9,0x60,0xe6,0xd8,0x72,0x8f,0x77,0x01,102); +DEFINE_PROPERTYKEY(PKEY_Author, 0xf29f85e0,0x4ff9,0x1068,0xab,0x91,0x08,0x00,0x2b,0x27,0xb3,0xd9,4); +DEFINE_PROPERTYKEY(PKEY_CachedFileUpdaterContentIdForConflictResolution, 0xfceff153,0xe839,0x4cf3,0xa9,0xe7,0xea,0x22,0x83,0x20,0x94,0xb8,114); +DEFINE_PROPERTYKEY(PKEY_CachedFileUpdaterContentIdForStream, 0xfceff153,0xe839,0x4cf3,0xa9,0xe7,0xea,0x22,0x83,0x20,0x94,0xb8,113); +DEFINE_PROPERTYKEY(PKEY_Capacity, 0x9b174b35,0x40ff,0x11d2,0xa2,0x7e,0x00,0xc0,0x4f,0xc3,0x08,0x71,3); +DEFINE_PROPERTYKEY(PKEY_Category, 0xd5cdd502,0x2e9c,0x101b,0x93,0x97,0x08,0x00,0x2b,0x2c,0xf9,0xae,2); +DEFINE_PROPERTYKEY(PKEY_Comment, 0xf29f85e0,0x4ff9,0x1068,0xab,0x91,0x08,0x00,0x2b,0x27,0xb3,0xd9,6); +DEFINE_PROPERTYKEY(PKEY_Company, 0xd5cdd502,0x2e9c,0x101b,0x93,0x97,0x08,0x00,0x2b,0x2c,0xf9,0xae,15); +DEFINE_PROPERTYKEY(PKEY_ComputerName, 0x28636aa6,0x953d,0x11d2,0xb5,0xd6,0x00,0xc0,0x4f,0xd9,0x18,0xd0,5); +DEFINE_PROPERTYKEY(PKEY_ContainedItems, 0x28636aa6,0x953d,0x11d2,0xb5,0xd6,0x00,0xc0,0x4f,0xd9,0x18,0xd0,29); +DEFINE_PROPERTYKEY(PKEY_ContentId, 0xfceff153,0xe839,0x4cf3,0xa9,0xe7,0xea,0x22,0x83,0x20,0x94,0xb8,132); +DEFINE_PROPERTYKEY(PKEY_ContentStatus, 0xd5cdd502,0x2e9c,0x101b,0x93,0x97,0x08,0x00,0x2b,0x2c,0xf9,0xae,27); +DEFINE_PROPERTYKEY(PKEY_ContentType, 0xd5cdd502,0x2e9c,0x101b,0x93,0x97,0x08,0x00,0x2b,0x2c,0xf9,0xae,26); +DEFINE_PROPERTYKEY(PKEY_ContentUri, 0xfceff153,0xe839,0x4cf3,0xa9,0xe7,0xea,0x22,0x83,0x20,0x94,0xb8,131); +DEFINE_PROPERTYKEY(PKEY_Copyright, 0x64440492,0x4c8b,0x11d1,0x8b,0x70,0x08,0x00,0x36,0xb1,0x1a,0x03,11); +DEFINE_PROPERTYKEY(PKEY_CreatorAppId, 0xc2ea046e,0x033c,0x4e91,0xbd,0x5b,0xd4,0x94,0x2f,0x6b,0xbe,0x49,2); +DEFINE_PROPERTYKEY(PKEY_CreatorOpenWithUIOptions, 0xc2ea046e,0x033c,0x4e91,0xbd,0x5b,0xd4,0x94,0x2f,0x6b,0xbe,0x49,3); +DEFINE_PROPERTYKEY(PKEY_DataObjectFormat, 0x1e81a3f8,0xa30f,0x4247,0xb9,0xee,0x1d,0x03,0x68,0xa9,0x42,0x5c,2); +DEFINE_PROPERTYKEY(PKEY_DateAccessed, 0xb725f130,0x47ef,0x101a,0xa5,0xf1,0x02,0x60,0x8c,0x9e,0xeb,0xac,16); +DEFINE_PROPERTYKEY(PKEY_DateAcquired, 0x2cbaa8f5,0xd81f,0x47ca,0xb1,0x7a,0xf8,0xd8,0x22,0x30,0x01,0x31,100); +DEFINE_PROPERTYKEY(PKEY_DateArchived, 0x43f8d7b7,0xa444,0x4f87,0x93,0x83,0x52,0x27,0x1c,0x9b,0x91,0x5c,100); +DEFINE_PROPERTYKEY(PKEY_DateCompleted, 0x72fab781,0xacda,0x43e5,0xb1,0x55,0xb2,0x43,0x4f,0x85,0xe6,0x78,100); +DEFINE_PROPERTYKEY(PKEY_DateCreated, 0xb725f130,0x47ef,0x101a,0xa5,0xf1,0x02,0x60,0x8c,0x9e,0xeb,0xac,15); +DEFINE_PROPERTYKEY(PKEY_DateImported, 0x14b81da1,0x0135,0x4d31,0x96,0xd9,0x6c,0xbf,0xc9,0x67,0x1a,0x99,18258); +DEFINE_PROPERTYKEY(PKEY_DateModified, 0xb725f130,0x47ef,0x101a,0xa5,0xf1,0x02,0x60,0x8c,0x9e,0xeb,0xac,14); +DEFINE_PROPERTYKEY(PKEY_DefaultSaveLocationDisplay, 0x5d76b67f,0x9b3d,0x44bb,0xb6,0xae,0x25,0xda,0x4f,0x63,0x8a,0x67,10); +DEFINE_PROPERTYKEY(PKEY_DueDate, 0x3f8472b5,0xe0af,0x4db2,0x80,0x71,0xc5,0x3f,0xe7,0x6a,0xe7,0xce,100); +DEFINE_PROPERTYKEY(PKEY_EndDate, 0xc75faa05,0x96fd,0x49e7,0x9c,0xb4,0x9f,0x60,0x10,0x82,0xd5,0x53,100); +DEFINE_PROPERTYKEY(PKEY_ExpandoProperties, 0x6fa20de6,0xd11c,0x4d9d,0xa1,0x54,0x64,0x31,0x76,0x28,0xc1,0x2d,100); +DEFINE_PROPERTYKEY(PKEY_FileAllocationSize, 0xb725f130,0x47ef,0x101a,0xa5,0xf1,0x02,0x60,0x8c,0x9e,0xeb,0xac,18); +DEFINE_PROPERTYKEY(PKEY_FileAttributes, 0xb725f130,0x47ef,0x101a,0xa5,0xf1,0x02,0x60,0x8c,0x9e,0xeb,0xac,13); +DEFINE_PROPERTYKEY(PKEY_FileCount, 0x28636aa6,0x953d,0x11d2,0xb5,0xd6,0x00,0xc0,0x4f,0xd9,0x18,0xd0,12); +DEFINE_PROPERTYKEY(PKEY_FileDescription, 0x0cef7d53,0xfa64,0x11d1,0xa2,0x03,0x00,0x00,0xf8,0x1f,0xed,0xee,3); +DEFINE_PROPERTYKEY(PKEY_FileExtension, 0xe4f10a3c,0x49e6,0x405d,0x82,0x88,0xa2,0x3b,0xd4,0xee,0xaa,0x6c,100); +DEFINE_PROPERTYKEY(PKEY_FileFRN, 0xb725f130,0x47ef,0x101a,0xa5,0xf1,0x02,0x60,0x8c,0x9e,0xeb,0xac,21); +DEFINE_PROPERTYKEY(PKEY_FileName, 0x41cf5ae0,0xf75a,0x4806,0xbd,0x87,0x59,0xc7,0xd9,0x24,0x8e,0xb9,100); +DEFINE_PROPERTYKEY(PKEY_FileOfflineAvailabilityStatus, 0xfceff153,0xe839,0x4cf3,0xa9,0xe7,0xea,0x22,0x83,0x20,0x94,0xb8,100); +DEFINE_PROPERTYKEY(PKEY_FileOwner, 0x9b174b34,0x40ff,0x11d2,0xa2,0x7e,0x00,0xc0,0x4f,0xc3,0x08,0x71,4); +DEFINE_PROPERTYKEY(PKEY_FilePlaceholderStatus, 0xb2f9b9d6,0xfec4,0x4dd5,0x94,0xd7,0x89,0x57,0x48,0x8c,0x80,0x7b,2); +DEFINE_PROPERTYKEY(PKEY_FileVersion, 0x0cef7d53,0xfa64,0x11d1,0xa2,0x03,0x00,0x00,0xf8,0x1f,0xed,0xee,4); +DEFINE_PROPERTYKEY(PKEY_FindData, 0x28636aa6,0x953d,0x11d2,0xb5,0xd6,0x00,0xc0,0x4f,0xd9,0x18,0xd0,0); +DEFINE_PROPERTYKEY(PKEY_FlagColor, 0x67df94de,0x0ca7,0x4d6f,0xb7,0x92,0x05,0x3a,0x3e,0x4f,0x03,0xcf,100); +DEFINE_PROPERTYKEY(PKEY_FlagColorText, 0x45eae747,0x8e2a,0x40ae,0x8c,0xbf,0xca,0x52,0xab,0xa6,0x15,0x2a,100); +DEFINE_PROPERTYKEY(PKEY_FlagStatus, 0xe3e0584c,0xb788,0x4a5a,0xbb,0x20,0x7f,0x5a,0x44,0xc9,0xac,0xdd,12); +DEFINE_PROPERTYKEY(PKEY_FlagStatusText, 0xdc54fd2e,0x189d,0x4871,0xaa,0x01,0x08,0xc2,0xf5,0x7a,0x4a,0xbc,100); +DEFINE_PROPERTYKEY(PKEY_FolderKind, 0xfceff153,0xe839,0x4cf3,0xa9,0xe7,0xea,0x22,0x83,0x20,0x94,0xb8,101); +DEFINE_PROPERTYKEY(PKEY_FolderNameDisplay, 0xb725f130,0x47ef,0x101a,0xa5,0xf1,0x02,0x60,0x8c,0x9e,0xeb,0xac,25); +DEFINE_PROPERTYKEY(PKEY_FreeSpace, 0x9b174b35,0x40ff,0x11d2,0xa2,0x7e,0x00,0xc0,0x4f,0xc3,0x08,0x71,2); +DEFINE_PROPERTYKEY(PKEY_FullText, 0x1e3ee840,0xbc2b,0x476c,0x82,0x37,0x2a,0xcd,0x1a,0x83,0x9b,0x22,6); +DEFINE_PROPERTYKEY(PKEY_HighKeywords, 0xf29f85e0,0x4ff9,0x1068,0xab,0x91,0x08,0x00,0x2b,0x27,0xb3,0xd9,24); +DEFINE_PROPERTYKEY(PKEY_Identity, 0xa26f4afc,0x7346,0x4299,0xbe,0x47,0xeb,0x1a,0xe6,0x13,0x13,0x9f,100); +DEFINE_PROPERTYKEY(PKEY_Identity_Blob, 0x8c3b93a4,0xbaed,0x1a83,0x9a,0x32,0x10,0x2e,0xe3,0x13,0xf6,0xeb,100); +DEFINE_PROPERTYKEY(PKEY_Identity_DisplayName, 0x7d683fc9,0xd155,0x45a8,0xbb,0x1f,0x89,0xd1,0x9b,0xcb,0x79,0x2f,100); +DEFINE_PROPERTYKEY(PKEY_Identity_InternetSid, 0x6d6d5d49,0x265d,0x4688,0x9f,0x4e,0x1f,0xdd,0x33,0xe7,0xcc,0x83,100); +DEFINE_PROPERTYKEY(PKEY_Identity_IsMeIdentity, 0xa4108708,0x09df,0x4377,0x9d,0xfc,0x6d,0x99,0x98,0x6d,0x5a,0x67,100); +DEFINE_PROPERTYKEY(PKEY_Identity_KeyProviderContext, 0xa26f4afc,0x7346,0x4299,0xbe,0x47,0xeb,0x1a,0xe6,0x13,0x13,0x9f,17); +DEFINE_PROPERTYKEY(PKEY_Identity_KeyProviderName, 0xa26f4afc,0x7346,0x4299,0xbe,0x47,0xeb,0x1a,0xe6,0x13,0x13,0x9f,16); +DEFINE_PROPERTYKEY(PKEY_Identity_LogonStatusString, 0xf18dedf3,0x337f,0x42c0,0x9e,0x03,0xce,0xe0,0x87,0x08,0xa8,0xc3,100); +DEFINE_PROPERTYKEY(PKEY_Identity_PrimaryEmailAddress, 0xfcc16823,0xbaed,0x4f24,0x9b,0x32,0xa0,0x98,0x21,0x17,0xf7,0xfa,100); +DEFINE_PROPERTYKEY(PKEY_Identity_PrimarySid, 0x2b1b801e,0xc0c1,0x4987,0x9e,0xc5,0x72,0xfa,0x89,0x81,0x47,0x87,100); +DEFINE_PROPERTYKEY(PKEY_Identity_ProviderData, 0xa8a74b92,0x361b,0x4e9a,0xb7,0x22,0x7c,0x4a,0x73,0x30,0xa3,0x12,100); +DEFINE_PROPERTYKEY(PKEY_Identity_ProviderID, 0x74a7de49,0xfa11,0x4d3d,0xa0,0x06,0xdb,0x7e,0x08,0x67,0x59,0x16,100); +DEFINE_PROPERTYKEY(PKEY_Identity_QualifiedUserName, 0xda520e51,0xf4e9,0x4739,0xac,0x82,0x02,0xe0,0xa9,0x5c,0x90,0x30,100); +DEFINE_PROPERTYKEY(PKEY_Identity_UniqueID, 0xe55fc3b0,0x2b60,0x4220,0x91,0x8e,0xb2,0x1e,0x8b,0xf1,0x60,0x16,100); +DEFINE_PROPERTYKEY(PKEY_Identity_UserName, 0xc4322503,0x78ca,0x49c6,0x9a,0xcc,0xa6,0x8e,0x2a,0xfd,0x7b,0x6b,100); +DEFINE_PROPERTYKEY(PKEY_IdentityProvider_Name, 0xb96eff7b,0x35ca,0x4a35,0x86,0x07,0x29,0xe3,0xa5,0x4c,0x46,0xea,100); +DEFINE_PROPERTYKEY(PKEY_IdentityProvider_Picture, 0x2425166f,0x5642,0x4864,0x99,0x2f,0x98,0xfd,0x98,0xf2,0x94,0xc3,100); +DEFINE_PROPERTYKEY(PKEY_ImageParsingName, 0xd7750ee0,0xc6a4,0x48ec,0xb5,0x3e,0xb8,0x7b,0x52,0xe6,0xd0,0x73,100); +DEFINE_PROPERTYKEY(PKEY_Importance, 0xe3e0584c,0xb788,0x4a5a,0xbb,0x20,0x7f,0x5a,0x44,0xc9,0xac,0xdd,11); + +DEFINE_PROPERTYKEY(PKEY_ParentalRating, 0x64440492,0x4c8b,0x11d1,0x8b,0x70,0x08,0x00,0x36,0xb1,0x1a,0x03,21); +DEFINE_PROPERTYKEY(PKEY_Rating, 0x64440492,0x4c8b,0x11d1,0x8b,0x70,0x08,0x00,0x36,0xb1,0x1a,0x03,9); +DEFINE_PROPERTYKEY(PKEY_Keywords, 0xf29f85e0,0x4ff9,0x1068,0xab,0x91,0x08,0x00,0x2b,0x27,0xb3,0xd9,5); +DEFINE_PROPERTYKEY(PKEY_Language, 0xd5cdd502,0x2e9c,0x101b,0x93,0x97,0x08,0x00,0x2b,0x2c,0xf9,0xae,28); +DEFINE_PROPERTYKEY(PKEY_ThumbnailStream, 0xf29f85e0,0x4ff9,0x1068,0xab,0x91,0x08,0x00,0x2b,0x27,0xb3,0xd9,27); + DEFINE_PROPERTYKEY(PKEY_Title, 0xf29f85e0,0x4ff9,0x1068,0xab,0x91,0x08,0x00,0x2b,0x27,0xb3,0xd9,2); DEFINE_PROPERTYKEY(PKEY_ItemName, 0x6b8da074,0x3b5c,0x43bc,0x88,0x6f,0x0a,0x2c,0xdc,0xe0,0x0b,0x6f,100);

1 0

Zhiyi Zhang : user32: Use wait_graphics_driver_ready() in load_desktop_driver().
by Alexandre Julliard 14 May '21

14 May '21

Module: wine Branch: master Commit: ce72f9b4263a898503c154a37df6bc9d43153f4b URL: https://source.winehq.org/git/wine.git/?a=commit;h=ce72f9b4263a898503c154a3… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu May 13 18:35:38 2021 +0800 user32: Use wait_graphics_driver_ready() in load_desktop_driver(). So that Wine doesn't have to send an extra WM_NULL message when wait_graphics_driver_ready() is later called in EnumDisplayDevicesW(). Also, it avoids a deadlock when wait_graphics_driver_ready() is used in later patches. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/driver.c | 2 +- dlls/user32/sysparams.c | 2 +- dlls/user32/user_private.h | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c index 1c3b62eff2b..87c8cd621b3 100644 --- a/dlls/user32/driver.c +++ b/dlls/user32/driver.c @@ -55,7 +55,7 @@ static BOOL load_desktop_driver( HWND hwnd, HMODULE *module ) USER_CheckNotLock(); strcpy( driver_load_error, "The explorer process failed to start." ); /* default error */ - SendMessageW( hwnd, WM_NULL, 0, 0 ); /* wait for the desktop process to be ready */ + wait_graphics_driver_ready(); guid_atom = HandleToULong( GetPropW( hwnd, L"__wine_display_device_guid" )); lstrcpyW( key, L"System\\CurrentControlSet\\Control\\Video\\{" ); diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 55d6d7e53a7..0b4dbfc2d78 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -583,7 +583,7 @@ static void release_display_device_init_mutex( HANDLE mutex ) } /* Wait until graphics driver is loaded by explorer */ -static void wait_graphics_driver_ready(void) +void wait_graphics_driver_ready(void) { static BOOL ready = FALSE; diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index db082462f1b..974d18be482 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -258,6 +258,7 @@ extern void move_window_bits( HWND hwnd, struct window_surface *old_surface, extern void move_window_bits_parent( HWND hwnd, HWND parent, const RECT *window_rect, const RECT *valid_rects ) DECLSPEC_HIDDEN; extern void update_window_state( HWND hwnd ) DECLSPEC_HIDDEN; +extern void wait_graphics_driver_ready(void) DECLSPEC_HIDDEN; extern void *get_hook_proc( void *proc, const WCHAR *module, HMODULE *free_module ) DECLSPEC_HIDDEN; extern RECT get_virtual_screen_rect(void) DECLSPEC_HIDDEN; extern LRESULT call_current_hook( HHOOK hhook, INT code, WPARAM wparam, LPARAM lparam ) DECLSPEC_HIDDEN;

1 0

Zebediah Figura : server: Poll for FD_CLOSE even if we cannot receive more data.
by Alexandre Julliard 14 May '21

14 May '21

Module: wine Branch: master Commit: aa6b2482ccf08a699e14d00aad2e2ffd040218dd URL: https://source.winehq.org/git/wine.git/?a=commit;h=aa6b2482ccf08a699e14d00a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu May 13 22:54:35 2021 -0500 server: Poll for FD_CLOSE even if we cannot receive more data. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/sock.c | 6 +++--- server/sock.c | 3 +-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 266ddc14451..9116c2b169d 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -4455,12 +4455,12 @@ static void test_close_events(struct event_test_ctx *ctx) check_events(ctx, 0, 0, 0); select_events(ctx, server, FD_ACCEPT | FD_CLOSE | FD_CONNECT | FD_OOB | FD_READ); if (ctx->is_message) - check_events_todo_msg(ctx, FD_CLOSE, 0, 200); + check_events(ctx, FD_CLOSE, 0, 200); check_events(ctx, 0, 0, 0); select_events(ctx, server, 0); select_events(ctx, server, FD_ACCEPT | FD_CLOSE | FD_CONNECT | FD_OOB | FD_READ); if (ctx->is_message) - check_events_todo_msg(ctx, FD_CLOSE, 0, 200); + check_events(ctx, FD_CLOSE, 0, 200); check_events(ctx, 0, 0, 0); ret = recv(server, buffer, 5, 0); @@ -4553,7 +4553,7 @@ static void test_close_events(struct event_test_ctx *ctx) check_events(ctx, 0, 0, 200); select_events(ctx, server, FD_ACCEPT | FD_CLOSE | FD_CONNECT | FD_OOB | FD_READ); - check_events_todo_event(ctx, FD_CLOSE, 0, 200); + check_events_todo(ctx, FD_CLOSE, 0, 200); closesocket(server); } diff --git a/server/sock.c b/server/sock.c index c8cd603149b..92202d317c4 100644 --- a/server/sock.c +++ b/server/sock.c @@ -786,8 +786,7 @@ static int sock_get_poll_events( struct fd *fd ) else if (smask & FD_READ || (sock->state & FD_WINE_LISTENING && mask & FD_ACCEPT)) ev |= POLLIN | POLLPRI; /* We use POLLIN with 0 bytes recv() as FD_CLOSE indication for stream sockets. */ - else if (sock->type == WS_SOCK_STREAM && (sock->state & FD_READ) && (mask & FD_CLOSE) && - !(sock->reported_events & FD_READ)) + else if (sock->type == WS_SOCK_STREAM && (mask & FD_CLOSE) && !(sock->reported_events & FD_READ)) ev |= POLLIN; if (async_queued( &sock->write_q ))

1 0

Zebediah Figura : server: Always clear pending messages in sock_wake_up().
by Alexandre Julliard 14 May '21

14 May '21

Module: wine Branch: master Commit: 21efebbdc1350fdc987e8c7dcf35256907387d58 URL: https://source.winehq.org/git/wine.git/?a=commit;h=21efebbdc1350fdc987e8c7d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu May 13 22:54:36 2021 -0500 server: Always clear pending messages in sock_wake_up(). Instead of clearing all messages when any match. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/sock.c | 2 +- server/sock.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 9116c2b169d..33cdd5d6d15 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -4553,7 +4553,7 @@ static void test_close_events(struct event_test_ctx *ctx) check_events(ctx, 0, 0, 200); select_events(ctx, server, FD_ACCEPT | FD_CLOSE | FD_CONNECT | FD_OOB | FD_READ); - check_events_todo(ctx, FD_CLOSE, 0, 200); + check_events_todo_event(ctx, FD_CLOSE, 0, 200); closesocket(server); } diff --git a/server/sock.c b/server/sock.c index 92202d317c4..340566cbb0a 100644 --- a/server/sock.c +++ b/server/sock.c @@ -400,12 +400,11 @@ static void sock_wake_up( struct sock *sock ) unsigned int events = sock->pending_events & sock->mask; int i; - if ( !events ) return; - if (sock->event) { if (debug_level) fprintf(stderr, "signalling events %x ptr %p\n", events, sock->event ); - set_event( sock->event ); + if (events) + set_event( sock->event ); } if (sock->window) {

1 0