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

Piotr Caban : msvcrt: Import fmodf implementation from musl.
by Alexandre Julliard 18 May '21

18 May '21

Module: wine Branch: master Commit: bc5f28888ce57514dc7a7b4eec316d3327bcbb51 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bc5f28888ce57514dc7a7b4e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue May 18 19:08:28 2021 +0200 msvcrt: Import fmodf 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 | 70 ++++++++++++++++++++++++++++++++++++++++++++++----- dlls/msvcrt/unixlib.c | 9 ------- dlls/msvcrt/unixlib.h | 1 - 3 files changed, 64 insertions(+), 16 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index d71a7108b5d..de0db9cca50 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -620,12 +620,70 @@ float CDECL expf( float x ) /********************************************************************* * fmodf (MSVCRT.@) + * + * Copied from musl: src/math/fmodf.c */ float CDECL fmodf( float x, float y ) { - float ret = unix_funcs->fmodf( x, y ); - if (!isfinite(x) || !isfinite(y)) return math_error(_DOMAIN, "fmodf", x, 0, ret); - return ret; + UINT32 xi = *(UINT32*)&x; + UINT32 yi = *(UINT32*)&y; + int ex = xi>>23 & 0xff; + int ey = yi>>23 & 0xff; + UINT32 sx = xi & 0x80000000; + UINT32 i; + + if (isinf(x)) return math_error(_DOMAIN, "fmodf", x, y, (x * y) / (x * y)); + if (yi << 1 == 0 || isnan(y) || ex == 0xff) + return (x * y) / (x * y); + if (xi << 1 <= yi << 1) { + if (xi << 1 == yi << 1) + return 0 * x; + return x; + } + + /* normalize x and y */ + if (!ex) { + for (i = xi << 9; i >> 31 == 0; ex--, i <<= 1); + xi <<= -ex + 1; + } else { + xi &= -1U >> 9; + xi |= 1U << 23; + } + if (!ey) { + for (i = yi << 9; i >> 31 == 0; ey--, i <<= 1); + yi <<= -ey + 1; + } else { + yi &= -1U >> 9; + yi |= 1U << 23; + } + + /* x mod y */ + for (; ex > ey; ex--) { + i = xi - yi; + if (i >> 31 == 0) { + if (i == 0) + return 0 * x; + xi = i; + } + xi <<= 1; + } + i = xi - yi; + if (i >> 31 == 0) { + if (i == 0) + return 0 * x; + xi = i; + } + for (; xi>>23 == 0; xi <<= 1, ex--); + + /* scale result up */ + if (ex > 0) { + xi -= 1U << 23; + xi |= (UINT32)ex << 23; + } else { + xi >>= -ex + 1; + } + xi |= sx; + return *(float*)ξ } /********************************************************************* @@ -633,9 +691,9 @@ float CDECL fmodf( float x, float y ) */ float CDECL logf( float x ) { - float ret = unix_funcs->logf( x ); - if (x < 0.0) return math_error(_DOMAIN, "logf", x, 0, ret); - if (x == 0.0) return math_error(_SING, "logf", x, 0, ret); + float ret = unix_funcs->logf( x ); + if (x < 0.0) return math_error(_DOMAIN, "logf", x, 0, ret); + if (x == 0.0) return math_error(_SING, "logf", x, 0, ret); return ret; } diff --git a/dlls/msvcrt/unixlib.c b/dlls/msvcrt/unixlib.c index 69ce6bb027e..a2bae9c6e5e 100644 --- a/dlls/msvcrt/unixlib.c +++ b/dlls/msvcrt/unixlib.c @@ -297,14 +297,6 @@ static float CDECL unix_fmaf( float x, float y, float z ) #endif } -/********************************************************************* - * fmodf - */ -static float CDECL unix_fmodf( float x, float y ) -{ - return fmodf( x, y ); -} - /********************************************************************* * frexp */ @@ -665,7 +657,6 @@ static const struct unix_funcs funcs = unix_expm1f, unix_fma, unix_fmaf, - unix_fmodf, unix_frexp, unix_frexpf, unix_hypot, diff --git a/dlls/msvcrt/unixlib.h b/dlls/msvcrt/unixlib.h index c1cd2c60d29..edb9e99d3e4 100644 --- a/dlls/msvcrt/unixlib.h +++ b/dlls/msvcrt/unixlib.h @@ -45,7 +45,6 @@ struct unix_funcs float (CDECL *expm1f)(float x); double (CDECL *fma)(double x, double y, double z); float (CDECL *fmaf)(float x, float y, float z); - float (CDECL *fmodf)(float x, float y); double (CDECL *frexp)(double x, int *exp); float (CDECL *frexpf)(float x, int *exp); double (CDECL *hypot)(double x, double y);

1 0

Piotr Caban : msvcrt: Import modf implementation from musl.
by Alexandre Julliard 18 May '21

18 May '21

Module: wine Branch: master Commit: 9984a5d661ff45b5e273dedaea9f80f0c1479ee6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9984a5d661ff45b5e273deda… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue May 18 19:08:37 2021 +0200 msvcrt: Import modf 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 | 32 +++++++++++++++++++++++++++++++- dlls/msvcrt/unixlib.c | 9 --------- dlls/msvcrt/unixlib.h | 1 - 3 files changed, 31 insertions(+), 11 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index de0db9cca50..a860dfc3d2b 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -2000,10 +2000,40 @@ double CDECL frexp( double x, int *exp ) /********************************************************************* * modf (MSVCRT.@) + * + * Copied from musl: src/math/modf.c */ double CDECL modf( double x, double *iptr ) { - return unix_funcs->modf( x, iptr ); + union {double f; UINT64 i;} u = {x}; + UINT64 mask; + int e = (u.i >> 52 & 0x7ff) - 0x3ff; + + /* no fractional part */ + if (e >= 52) { + *iptr = x; + if (e == 0x400 && u.i << 12 != 0) /* nan */ + return x; + u.i &= 1ULL << 63; + return u.f; + } + + /* no integral part*/ + if (e < 0) { + u.i &= 1ULL << 63; + *iptr = u.f; + return x; + } + + mask = -1ULL >> 12 >> e; + if ((u.i & mask) == 0) { + *iptr = x; + u.i &= 1ULL << 63; + return u.f; + } + u.i &= ~mask; + *iptr = u.f; + return x - u.f; } /********************************************************************** diff --git a/dlls/msvcrt/unixlib.c b/dlls/msvcrt/unixlib.c index a2bae9c6e5e..2a3d8ed4090 100644 --- a/dlls/msvcrt/unixlib.c +++ b/dlls/msvcrt/unixlib.c @@ -459,14 +459,6 @@ static float CDECL unix_logbf( float x ) return logbf( x ); } -/********************************************************************* - * modf - */ -static double CDECL unix_modf( double x, double *iptr ) -{ - return modf( x, iptr ); -} - /********************************************************************* * modff */ @@ -674,7 +666,6 @@ static const struct unix_funcs funcs = unix_log2f, unix_logb, unix_logbf, - unix_modf, unix_modff, unix_pow, unix_powf, diff --git a/dlls/msvcrt/unixlib.h b/dlls/msvcrt/unixlib.h index edb9e99d3e4..080c9da9d08 100644 --- a/dlls/msvcrt/unixlib.h +++ b/dlls/msvcrt/unixlib.h @@ -62,7 +62,6 @@ struct unix_funcs float (CDECL *log2f)(float x); double (CDECL *logb)(double x); float (CDECL *logbf)(float x); - double (CDECL *modf)(double x, double *iptr); float (CDECL *modff)(float x, float *iptr); double (CDECL *pow)(double x, double y); float (CDECL *powf)(float x, float y);

1 0

Piotr Caban : msvcrt: Import modff implementation from musl.
by Alexandre Julliard 18 May '21

18 May '21

Module: wine Branch: master Commit: 29e99741d94517b1b17b300a0c7b85a1c0806a00 URL: https://source.winehq.org/git/wine.git/?a=commit;h=29e99741d94517b1b17b300a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue May 18 19:08:44 2021 +0200 msvcrt: Import modff 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 | 32 +++++++++++++++++++++++++++++++- dlls/msvcrt/unixlib.c | 9 --------- dlls/msvcrt/unixlib.h | 1 - 3 files changed, 31 insertions(+), 11 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index a860dfc3d2b..fab505abfb5 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -922,10 +922,40 @@ float CDECL frexpf( float x, int *exp ) /********************************************************************* * modff (MSVCRT.@) + * + * Copied from musl: src/math/modff.c */ float CDECL modff( float x, float *iptr ) { - return unix_funcs->modff( x, iptr ); + union {float f; UINT32 i;} u = {x}; + UINT32 mask; + int e = (u.i >> 23 & 0xff) - 0x7f; + + /* no fractional part */ + if (e >= 23) { + *iptr = x; + if (e == 0x80 && u.i << 9 != 0) { /* nan */ + return x; + } + u.i &= 0x80000000; + return u.f; + } + /* no integral part */ + if (e < 0) { + u.i &= 0x80000000; + *iptr = u.f; + return x; + } + + mask = 0x007fffff >> e; + if ((u.i & mask) == 0) { + *iptr = x; + u.i &= 0x80000000; + return u.f; + } + u.i &= ~mask; + *iptr = u.f; + return x - u.f; } #endif diff --git a/dlls/msvcrt/unixlib.c b/dlls/msvcrt/unixlib.c index 2a3d8ed4090..62c6a5ae189 100644 --- a/dlls/msvcrt/unixlib.c +++ b/dlls/msvcrt/unixlib.c @@ -459,14 +459,6 @@ static float CDECL unix_logbf( float x ) return logbf( x ); } -/********************************************************************* - * modff - */ -static float CDECL unix_modff( float x, float *iptr ) -{ - return modff( x, iptr ); -} - /********************************************************************* * pow */ @@ -666,7 +658,6 @@ static const struct unix_funcs funcs = unix_log2f, unix_logb, unix_logbf, - unix_modff, unix_pow, unix_powf, unix_remainder, diff --git a/dlls/msvcrt/unixlib.h b/dlls/msvcrt/unixlib.h index 080c9da9d08..69f4e02f321 100644 --- a/dlls/msvcrt/unixlib.h +++ b/dlls/msvcrt/unixlib.h @@ -62,7 +62,6 @@ struct unix_funcs float (CDECL *log2f)(float x); double (CDECL *logb)(double x); float (CDECL *logbf)(float x); - float (CDECL *modff)(float x, float *iptr); double (CDECL *pow)(double x, double y); float (CDECL *powf)(float x, float y); double (CDECL *remainder)(double x, double y);

1 0

Piotr Caban : msvcrt: Import remquo implementation from musl.
by Alexandre Julliard 18 May '21

18 May '21

Module: wine Branch: master Commit: c7fa4673769c42bfb1b44ebfc7c981b458784e5a URL: https://source.winehq.org/git/wine.git/?a=commit;h=c7fa4673769c42bfb1b44ebf… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue May 18 19:09:00 2021 +0200 msvcrt: Import remquo 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 | 81 +++++++++++++++++++++++++++++++++++++++++++++++++-- dlls/msvcrt/unixlib.c | 14 --------- dlls/msvcrt/unixlib.h | 1 - include/config.h.in | 3 -- 6 files changed, 78 insertions(+), 23 deletions(-) diff --git a/configure b/configure index ac738ca964b..b243f0280f5 100755 --- a/configure +++ b/configure @@ -19640,7 +19640,6 @@ for ac_func in \ log2f \ remainder \ remainderf \ - remquo \ remquof \ tgamma \ tgammaf diff --git a/configure.ac b/configure.ac index 4c98c3e5597..8942a3eefc2 100644 --- a/configure.ac +++ b/configure.ac @@ -2680,7 +2680,6 @@ AC_CHECK_FUNCS(\ log2f \ remainder \ remainderf \ - remquo \ remquof \ tgamma \ tgammaf diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index fab505abfb5..f4c5c69fc4b 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -5496,12 +5496,87 @@ float CDECL remainderf(float x, float y) /********************************************************************* * remquo (MSVCR120.@) + * + * Copied from musl: src/math/remquo.c */ double CDECL remquo(double x, double y, int *quo) { - if(!isfinite(x)) *_errno() = EDOM; - if(isnan(y) || y==0.0) *_errno() = EDOM; - return unix_funcs->remquo( x, y, quo ); + UINT64 uxi = *(UINT64*)&x; + UINT64 uyi = *(UINT64*)&y; + int ex = uxi >> 52 & 0x7ff; + int ey = uyi >> 52 & 0x7ff; + int sx = uxi >> 63; + int sy = uyi >> 63; + UINT32 q; + UINT64 i; + + *quo = 0; + if (y == 0 || isinf(x)) *_errno() = EDOM; + if (uyi << 1 == 0 || isnan(y) || ex == 0x7ff) + return (x * y) / (x * y); + if (uxi << 1 == 0) + return x; + + /* normalize x and y */ + if (!ex) { + for (i = uxi << 12; i >> 63 == 0; ex--, i <<= 1); + uxi <<= -ex + 1; + } else { + uxi &= -1ULL >> 12; + uxi |= 1ULL << 52; + } + if (!ey) { + for (i = uyi << 12; i >> 63 == 0; ey--, i <<= 1); + uyi <<= -ey + 1; + } else { + uyi &= -1ULL >> 12; + uyi |= 1ULL << 52; + } + + q = 0; + if (ex < ey) { + if (ex+1 == ey) + goto end; + return x; + } + + /* x mod y */ + for (; ex > ey; ex--) { + i = uxi - uyi; + if (i >> 63 == 0) { + uxi = i; + q++; + } + uxi <<= 1; + q <<= 1; + } + i = uxi - uyi; + if (i >> 63 == 0) { + uxi = i; + q++; + } + if (uxi == 0) + ex = -60; + else + for (; uxi >> 52 == 0; uxi <<= 1, ex--); +end: + /* scale result and decide between |x| and |x|-|y| */ + if (ex > 0) { + uxi -= 1ULL << 52; + uxi |= (UINT64)ex << 52; + } else { + uxi >>= -ex + 1; + } + x = *(double*)&uxi; + if (sy) + y = -y; + if (ex == ey || (ex + 1 == ey && (2 * x > y || (2 * x == y && q % 2)))) { + x -= y; + q++; + } + q &= 0x7fffffff; + *quo = sx ^ sy ? -(int)q : (int)q; + return sx ? -x : x; } /********************************************************************* diff --git a/dlls/msvcrt/unixlib.c b/dlls/msvcrt/unixlib.c index 62c6a5ae189..05d8c2bd83a 100644 --- a/dlls/msvcrt/unixlib.c +++ b/dlls/msvcrt/unixlib.c @@ -501,19 +501,6 @@ static float CDECL unix_remainderf(float x, float y) #endif } -/********************************************************************* - * remquo - */ -static double CDECL unix_remquo(double x, double y, int *quo) -{ -#ifdef HAVE_REMQUO - return remquo(x, y, quo); -#else - FIXME( "not implemented\n" ); - return 0; -#endif -} - /********************************************************************* * remquof */ @@ -662,7 +649,6 @@ static const struct unix_funcs funcs = unix_powf, unix_remainder, unix_remainderf, - unix_remquo, unix_remquof, unix_sin, unix_sinf, diff --git a/dlls/msvcrt/unixlib.h b/dlls/msvcrt/unixlib.h index 69f4e02f321..9f91c097d71 100644 --- a/dlls/msvcrt/unixlib.h +++ b/dlls/msvcrt/unixlib.h @@ -66,7 +66,6 @@ struct unix_funcs float (CDECL *powf)(float x, float y); double (CDECL *remainder)(double x, double y); float (CDECL *remainderf)(float x, float y); - double (CDECL *remquo)(double x, double y, int *quo); float (CDECL *remquof)(float x, float y, int *quo); double (CDECL *sin)(double x); float (CDECL *sinf)(float x); diff --git a/include/config.h.in b/include/config.h.in index bf7fc0d4e9b..7d0c5e934e6 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -636,9 +636,6 @@ /* Define to 1 if you have the `remainderf' function. */ #undef HAVE_REMAINDERF -/* Define to 1 if you have the `remquo' function. */ -#undef HAVE_REMQUO - /* Define to 1 if you have the `remquof' function. */ #undef HAVE_REMQUOF

1 0

Piotr Caban : msvcrt: Import remquof implementation from musl.
by Alexandre Julliard 18 May '21

18 May '21

Module: wine Branch: master Commit: 8a2f7c731fcf5bf21449f1cd8eadad8305472621 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8a2f7c731fcf5bf21449f1cd… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue May 18 19:09:07 2021 +0200 msvcrt: Import remquof 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 | 80 +++++++++++++++++++++++++++++++++++++++++++++++++-- dlls/msvcrt/unixlib.c | 14 --------- dlls/msvcrt/unixlib.h | 1 - include/config.h.in | 3 -- 6 files changed, 77 insertions(+), 23 deletions(-) diff --git a/configure b/configure index b243f0280f5..0ec898ca762 100755 --- a/configure +++ b/configure @@ -19640,7 +19640,6 @@ for ac_func in \ log2f \ remainder \ remainderf \ - remquof \ tgamma \ tgammaf diff --git a/configure.ac b/configure.ac index 8942a3eefc2..72db35563e7 100644 --- a/configure.ac +++ b/configure.ac @@ -2680,7 +2680,6 @@ AC_CHECK_FUNCS(\ log2f \ remainder \ remainderf \ - remquof \ tgamma \ tgammaf ) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index f4c5c69fc4b..ae3b9aa76e6 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -5581,12 +5581,86 @@ end: /********************************************************************* * remquof (MSVCR120.@) + * + * Copied from musl: src/math/remquof.c */ float CDECL remquof(float x, float y, int *quo) { - if(!isfinite(x)) *_errno() = EDOM; - if(isnan(y) || y==0.0f) *_errno() = EDOM; - return unix_funcs->remquof( x, y, quo ); + UINT32 uxi = *(UINT32*)&x; + UINT32 uyi = *(UINT32*)&y; + int ex = uxi >> 23 & 0xff; + int ey = uyi >> 23 & 0xff; + int sx = uxi >> 31; + int sy = uyi>> 31; + UINT32 q, i; + + *quo = 0; + if (y == 0 || isinf(x)) *_errno() = EDOM; + if (uyi << 1 == 0 || isnan(y) || ex == 0xff) + return (x * y) / (x * y); + if (uxi << 1 == 0) + return x; + + /* normalize x and y */ + if (!ex) { + for (i = uxi << 9; i >> 31 == 0; ex--, i <<= 1); + uxi <<= -ex + 1; + } else { + uxi &= -1U >> 9; + uxi |= 1U << 23; + } + if (!ey) { + for (i = uyi << 9; i >> 31 == 0; ey--, i <<= 1); + uyi <<= -ey + 1; + } else { + uyi &= -1U >> 9; + uyi |= 1U << 23; + } + + q = 0; + if (ex < ey) { + if (ex + 1 == ey) + goto end; + return x; + } + + /* x mod y */ + for (; ex > ey; ex--) { + i = uxi - uyi; + if (i >> 31 == 0) { + uxi = i; + q++; + } + uxi <<= 1; + q <<= 1; + } + i = uxi - uyi; + if (i >> 31 == 0) { + uxi = i; + q++; + } + if (uxi == 0) + ex = -30; + else + for (; uxi >> 23 == 0; uxi <<= 1, ex--); +end: + /* scale result and decide between |x| and |x|-|y| */ + if (ex > 0) { + uxi -= 1U << 23; + uxi |= (UINT32)ex << 23; + } else { + uxi >>= -ex + 1; + } + x = *(float*)&uxi; + if (sy) + y = -y; + if (ex == ey || (ex + 1 == ey && (2 * x > y || (2 * x == y && q % 2)))) { + x -= y; + q++; + } + q &= 0x7fffffff; + *quo = sx ^ sy ? -(int)q : (int)q; + return sx ? -x : x; } /********************************************************************* diff --git a/dlls/msvcrt/unixlib.c b/dlls/msvcrt/unixlib.c index 05d8c2bd83a..cd22d36acb4 100644 --- a/dlls/msvcrt/unixlib.c +++ b/dlls/msvcrt/unixlib.c @@ -501,19 +501,6 @@ static float CDECL unix_remainderf(float x, float y) #endif } -/********************************************************************* - * remquof - */ -static float CDECL unix_remquof(float x, float y, int *quo) -{ -#ifdef HAVE_REMQUOF - return remquof(x, y, quo); -#else - FIXME( "not implemented\n" ); - return 0; -#endif -} - /********************************************************************* * sin */ @@ -649,7 +636,6 @@ static const struct unix_funcs funcs = unix_powf, unix_remainder, unix_remainderf, - unix_remquof, unix_sin, unix_sinf, unix_sinh, diff --git a/dlls/msvcrt/unixlib.h b/dlls/msvcrt/unixlib.h index 9f91c097d71..f71ceea1cab 100644 --- a/dlls/msvcrt/unixlib.h +++ b/dlls/msvcrt/unixlib.h @@ -66,7 +66,6 @@ struct unix_funcs float (CDECL *powf)(float x, float y); double (CDECL *remainder)(double x, double y); float (CDECL *remainderf)(float x, float y); - float (CDECL *remquof)(float x, float y, int *quo); double (CDECL *sin)(double x); float (CDECL *sinf)(float x); double (CDECL *sinh)(double x); diff --git a/include/config.h.in b/include/config.h.in index 7d0c5e934e6..1d54a041ce2 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -636,9 +636,6 @@ /* Define to 1 if you have the `remainderf' function. */ #undef HAVE_REMAINDERF -/* Define to 1 if you have the `remquof' function. */ -#undef HAVE_REMQUOF - /* Define to 1 if the system has the type `request_sense'. */ #undef HAVE_REQUEST_SENSE

1 0

Dongwan Kim : gdiplus: Implement GdipEnumerateMetafileSrcRectDestRectI.
by Alexandre Julliard 18 May '21

18 May '21

Module: wine Branch: master Commit: aa54278250333abcebeb19ed35842a979850a403 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aa54278250333abcebeb19ed… Author: Dongwan Kim <kdw6485(a)gmail.com> Date: Thu May 13 12:09:27 2021 +0900 gdiplus: Implement GdipEnumerateMetafileSrcRectDestRectI. Signed-off-by: Dongwan Kim <kdw6485(a)gmail.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/metafile.c | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index bda8bd56a3f..15d9b5d81e8 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -201,7 +201,7 @@ 201 stdcall GdipEnumerateMetafileSrcRectDestPoints(ptr ptr ptr long ptr long ptr ptr ptr) 202 stub GdipEnumerateMetafileSrcRectDestPointsI 203 stdcall GdipEnumerateMetafileSrcRectDestRect(ptr ptr ptr ptr long ptr ptr ptr) -204 stub GdipEnumerateMetafileSrcRectDestRectI +204 stdcall GdipEnumerateMetafileSrcRectDestRectI(ptr ptr ptr ptr long ptr ptr ptr) 205 stdcall GdipFillClosedCurve2(ptr ptr ptr long float long) 206 stdcall GdipFillClosedCurve2I(ptr ptr ptr long float long) 207 stdcall GdipFillClosedCurve(ptr ptr ptr long) diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index f4824d4257b..d79c939218c 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -3666,6 +3666,25 @@ GpStatus WINGDIPAPI GdipEnumerateMetafileSrcRectDestRect( GpGraphics *graphics, return GdipEnumerateMetafileSrcRectDestPoints(graphics, metafile, points, 3, src, srcUnit, callback, cb_data, attrs); } +GpStatus WINGDIPAPI GdipEnumerateMetafileSrcRectDestRectI( GpGraphics * graphics, + GDIPCONST GpMetafile *metafile, GDIPCONST Rect *destRect, + GDIPCONST Rect *srcRect, Unit srcUnit, EnumerateMetafileProc callback, + VOID *cb_data, GDIPCONST GpImageAttributes *attrs ) +{ + GpRectF destRectF, srcRectF; + + destRectF.X = destRect->X; + destRectF.Y = destRect->Y; + destRectF.Width = destRect->Width; + destRectF.Height = destRect->Height; + + srcRectF.X = srcRect->X; + srcRectF.Y = srcRect->Y; + srcRectF.Width = srcRect->Width; + srcRectF.Height = srcRect->Height; + + return GdipEnumerateMetafileSrcRectDestRect( graphics, metafile, &destRectF, &srcRectF, srcUnit, callback, cb_data, attrs); +} GpStatus WINGDIPAPI GdipEnumerateMetafileDestRect(GpGraphics *graphics, GDIPCONST GpMetafile *metafile, GDIPCONST GpRectF *dest,

1 0

Derek Lesho : winevulkan: Specify which structures to ignore in STRUCT_CHAIN_CONVERSIONS.
by Alexandre Julliard 18 May '21

18 May '21

Module: wine Branch: master Commit: 0c74c809c7acf73cfce2418bb5d8fe18567ec648 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0c74c809c7acf73cfce2418b… Author: Derek Lesho <dlesho(a)codeweavers.com> Date: Mon May 17 16:00:58 2021 -0400 winevulkan: Specify which structures to ignore in STRUCT_CHAIN_CONVERSIONS. Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> Signed-off-by: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 22 +++++++++++++--------- dlls/winevulkan/vulkan_thunks.c | 2 -- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 135fd5cf06a..26023fd5fd6 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -256,10 +256,11 @@ FUNCTION_OVERRIDES = { "vkDebugMarkerSetObjectTagEXT" : {"dispatch": True, "driver" : False, "thunk" : ThunkType.PRIVATE}, } -STRUCT_CHAIN_CONVERSIONS = [ - "VkDeviceCreateInfo", - "VkInstanceCreateInfo", -] +STRUCT_CHAIN_CONVERSIONS = { + # Ignore to not confuse host loader. + "VkDeviceCreateInfo": ["VK_STRUCTURE_TYPE_LOADER_DEVICE_CREATE_INFO"], + "VkInstanceCreateInfo": ["VK_STRUCTURE_TYPE_LOADER_INSTANCE_CREATE_INFO"], +} class Direction(Enum): @@ -2417,9 +2418,10 @@ class FreeFunction(object): class StructChainConversionFunction(object): - def __init__(self, direction, struct): + def __init__(self, direction, struct, ignores): self.direction = direction self.struct = struct + self.ignores = ignores self.type = struct.name self.name = "convert_{0}_struct_chain".format(self.type) @@ -2444,9 +2446,8 @@ class StructChainConversionFunction(object): body += " switch (in_header->sType)\n" body += " {\n" - # Ignore to not confuse host loader. - body += " case VK_STRUCTURE_TYPE_LOADER_DEVICE_CREATE_INFO:\n" - body += " case VK_STRUCTURE_TYPE_LOADER_INSTANCE_CREATE_INFO:\n" + for i in self.ignores: + body += " case {0}:\n".format(i) body += " break;\n\n" for e in self.struct.struct_extensions: @@ -2455,6 +2456,9 @@ class StructChainConversionFunction(object): stype = next(x for x in e.members if x.name == "sType") + if stype.values in self.ignores: + continue + body += " case {0}:\n".format(stype.values) body += " {\n" @@ -2604,7 +2608,7 @@ class VkGenerator(object): for struct in self.registry.structs: if struct.name in STRUCT_CHAIN_CONVERSIONS: - self.struct_chain_conversions.append(StructChainConversionFunction(Direction.INPUT, struct)) + self.struct_chain_conversions.append(StructChainConversionFunction(Direction.INPUT, struct, STRUCT_CHAIN_CONVERSIONS[struct.name])) self.struct_chain_conversions.append(FreeStructChainFunction(struct)) # Once we decide to support pNext chains conversion everywhere, move this under get_conversions for e in struct.struct_extensions: diff --git a/dlls/winevulkan/vulkan_thunks.c b/dlls/winevulkan/vulkan_thunks.c index c0dbbe2b8b8..edb4bfd55da 100644 --- a/dlls/winevulkan/vulkan_thunks.c +++ b/dlls/winevulkan/vulkan_thunks.c @@ -2641,7 +2641,6 @@ VkResult convert_VkDeviceCreateInfo_struct_chain(const void *pNext, VkDeviceCrea switch (in_header->sType) { case VK_STRUCTURE_TYPE_LOADER_DEVICE_CREATE_INFO: - case VK_STRUCTURE_TYPE_LOADER_INSTANCE_CREATE_INFO: break; case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DEVICE_GENERATED_COMMANDS_FEATURES_NV: @@ -4264,7 +4263,6 @@ VkResult convert_VkInstanceCreateInfo_struct_chain(const void *pNext, VkInstance { switch (in_header->sType) { - case VK_STRUCTURE_TYPE_LOADER_DEVICE_CREATE_INFO: case VK_STRUCTURE_TYPE_LOADER_INSTANCE_CREATE_INFO: break;

1 0

Shawn M. Chapla : wine.inf: Don't use DDE for winebrowser by default.
by Alexandre Julliard 18 May '21

18 May '21

Module: wine Branch: master Commit: 2a667e28ba7800288f5873a4b13bc0baf6e4a857 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2a667e28ba7800288f5873a4… Author: Shawn M. Chapla <schapla(a)codeweavers.com> Date: Tue May 18 12:54:30 2021 -0400 wine.inf: Don't use DDE for winebrowser by default. Signed-off-by: Shawn M. Chapla <schapla(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/wine.inf.in | 36 ++++++------------------------------ 1 file changed, 6 insertions(+), 30 deletions(-) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index a20efbcce3e..c909f58f53c 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -260,11 +260,7 @@ HKCR,folder\shell\open\ddeexec\application,,2,"Folders" HKCR,folder\shellex\ContextMenuHandlers,,16 HKCR,hlpfile,,2,"Help File" HKCR,hlpfile\shell\open\command,,2,"%11%\winhlp32.exe %1" -HKCR,htmlfile\shell\open\command,,2,"""%11%\winebrowser.exe"" -nohome" -HKCR,htmlfile\shell\open\ddeexec,,2,"""%1"",,-1,0,,,," -HKCR,htmlfile\shell\open\ddeexec,"NoActivateHandler",2,"" -HKCR,htmlfile\shell\open\ddeexec\Application,,2,"IExplore" -HKCR,htmlfile\shell\open\ddeexec\Topic,,2,"WWW_OpenURL" +HKCR,htmlfile\shell\open\command,,2,"""%11%\winebrowser.exe"" %1" HKCR,inffile,,2,"Setup Information" HKCR,inffile\shell\install\command,,2,"%11%\rundll32.exe setupapi,InstallHinfSection DefaultInstall 132 %1" HKCR,inifile,,2,"Configuration Settings" @@ -286,11 +282,7 @@ HKCR,Msi.Patch,,2,"Windows Installer Patch" HKCR,Msi.Patch\DefaultIcon,,2,"msiexec.exe" HKCR,Msi.Patch\shell\Open\command,,2,"%11%\msiexec.exe /p ""%1""" HKCR,pdffile,,2,"PDF Document" -HKCR,pdffile\shell\open\command,,2,"""%11%\winebrowser.exe"" -nohome" -HKCR,pdffile\shell\open\ddeexec,,2,"""%1"",,-1,0,,,," -HKCR,pdffile\shell\open\ddeexec,"NoActivateHandler",2,"" -HKCR,pdffile\shell\open\ddeexec\Application,,2,"IExplore" -HKCR,pdffile\shell\open\ddeexec\Topic,,2,"WWW_OpenURL" +HKCR,pdffile\shell\open\command,,2,"""%11%\winebrowser.exe"" %1" HKCR,rtffile,,2,"Rich Text Document" HKCR,rtffile\shell\open\command,,2,"""%16422%\Windows NT\Accessories\wordpad.exe"" %1" HKCR,rtffile\shell\print\command,,2,"""%16422%\Windows NT\Accessories\wordpad.exe"" /p %1" @@ -300,26 +292,10 @@ HKCR,txtfile\shell\print\command,,2,"%11%\notepad.exe /p %1" HKCR,wrifile\shell\open\command,,2,"""%16422%\Windows NT\Accessories\wordpad.exe"" %1" HKCR,wrifile\shell\print\command,,2,"""%16422%\Windows NT\Accessories\wordpad.exe"" /p %1" HKCR,xmlfile,,2,"XML Document" -HKCR,xmlfile\shell\open\command,,2,"""%11%\winebrowser.exe"" -nohome" -HKCR,xmlfile\shell\open\ddeexec,,2,"""%1"",,-1,0,,,," -HKCR,xmlfile\shell\open\ddeexec,"NoActivateHandler",2,"" -HKCR,xmlfile\shell\open\ddeexec\Application,,2,"IExplore" -HKCR,xmlfile\shell\open\ddeexec\Topic,,2,"WWW_OpenURL" -HKCR,ftp\shell\open\command,,2,"""%11%\winebrowser.exe"" -nohome" -HKCR,ftp\shell\open\ddeexec,,2,"""%1"",,-1,0,,,," -HKCR,ftp\shell\open\ddeexec,"NoActivateHandler",2,"" -HKCR,ftp\shell\open\ddeexec\Application,,2,"IExplore" -HKCR,ftp\shell\open\ddeexec\Topic,,2,"WWW_OpenURL" -HKCR,http\shell\open\command,,2,"""%11%\winebrowser.exe"" -nohome" -HKCR,http\shell\open\ddeexec,,2,"""%1"",,-1,0,,,," -HKCR,http\shell\open\ddeexec,"NoActivateHandler",2,"" -HKCR,http\shell\open\ddeexec\Application,,2,"IExplore" -HKCR,http\shell\open\ddeexec\Topic,,2,"WWW_OpenURL" -HKCR,https\shell\open\command,,2,"""%11%\winebrowser.exe"" -nohome" -HKCR,https\shell\open\ddeexec,,2,"""%1"",,-1,0,,,," -HKCR,https\shell\open\ddeexec,"NoActivateHandler",2,"" -HKCR,https\shell\open\ddeexec\Application,,2,"IExplore" -HKCR,https\shell\open\ddeexec\Topic,,2,"WWW_OpenURL" +HKCR,xmlfile\shell\open\command,,2,"""%11%\winebrowser.exe"" %1" +HKCR,ftp\shell\open\command,,2,"""%11%\winebrowser.exe"" %1" +HKCR,http\shell\open\command,,2,"""%11%\winebrowser.exe"" %1" +HKCR,https\shell\open\command,,2,"""%11%\winebrowser.exe"" %1" HKCR,mailto\shell\open\command,,2,"%11%\winebrowser %1" HKCR,MIME\Database\Charset\_iso-2022-jp$ESC,"Codepage",0x10003,932

1 0

Zebediah Figura : ws2_32: Remove a leftover cast.
by Alexandre Julliard 18 May '21

18 May '21

Module: wine Branch: master Commit: 8fbf62ec47638ade6b4374541176fe90a6fb2c8f URL: https://source.winehq.org/git/wine.git/?a=commit;h=8fbf62ec47638ade6b437454… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon May 17 21:29:57 2021 -0500 ws2_32: Remove a leftover cast. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 94f3f139c9c..0c1ba594825 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2352,8 +2352,8 @@ SOCKET WINAPI WS_accept( SOCKET s, struct WS_sockaddr *addr, int *len ) TRACE("%#lx\n", s); if (!(sync_event = get_sync_event())) return INVALID_SOCKET; - status = NtDeviceIoControlFile( SOCKET2HANDLE(s), (HANDLE)((ULONG_PTR)sync_event | 0), NULL, NULL, &io, - IOCTL_AFD_WINE_ACCEPT, NULL, 0, &accept_handle, sizeof(accept_handle) ); + status = NtDeviceIoControlFile( (HANDLE)s, sync_event, NULL, NULL, &io, IOCTL_AFD_WINE_ACCEPT, + NULL, 0, &accept_handle, sizeof(accept_handle) ); if (status == STATUS_PENDING) { if (WaitForSingleObject( sync_event, INFINITE ) == WAIT_FAILED)

1 0

Zebediah Figura : server: Allow polling on an fd after it was removed.
by Alexandre Julliard 18 May '21

18 May '21

Module: wine Branch: master Commit: 737fe1f99337ab999cf67fb1acdf96f70020b3d4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=737fe1f99337ab999cf67fb1… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon May 17 21:29:58 2021 -0500 server: Allow polling on an fd after it was removed. In particular, so that we can wait for POLLOUT on a connecting socket multiple times, in case the first connection fails, without polling on it while it is unconnected. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/fd.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/server/fd.c b/server/fd.c index 481e9a88f0f..e7253ec8f51 100644 --- a/server/fd.c +++ b/server/fd.c @@ -549,7 +549,6 @@ static inline void set_fd_epoll_events( struct fd *fd, int user, int events ) } else if (pollfd[user].fd == -1) { - if (pollfd[user].events) return; /* stopped waiting on it, don't restart */ ctl = EPOLL_CTL_ADD; } else @@ -658,7 +657,6 @@ static inline void set_fd_epoll_events( struct fd *fd, int user, int events ) } else if (pollfd[user].fd == -1) { - if (pollfd[user].events) return; /* stopped waiting on it, don't restart */ ev[0].flags |= EV_ADD | ((events & POLLIN) ? EV_ENABLE : EV_DISABLE); ev[1].flags |= EV_ADD | ((events & POLLOUT) ? EV_ENABLE : EV_DISABLE); } @@ -767,7 +765,6 @@ static inline void set_fd_epoll_events( struct fd *fd, int user, int events ) } else if (pollfd[user].fd == -1) { - if (pollfd[user].events) return; /* stopped waiting on it, don't restart */ ret = port_associate( port_fd, PORT_SOURCE_FD, fd->unix_fd, events, (void *)user ); } else @@ -1647,7 +1644,7 @@ void set_fd_events( struct fd *fd, int events ) pollfd[user].events = POLLERR; pollfd[user].revents = 0; } - else if (pollfd[user].fd != -1 || !pollfd[user].events) + else { pollfd[user].fd = fd->unix_fd; pollfd[user].events = events;

1 0