August 2020 - Wine-commits - list.winehq.org

Piotr Caban : msvcrt: Import asin from musl.
by Alexandre Julliard 06 Aug '20

06 Aug '20

Module: wine Branch: master Commit: 2cb6a1780c37ad8f3a261600c3b187a192486b22 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2cb6a1780c37ad8f3a261600… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Aug 6 16:59:17 2020 +0200 msvcrt: Import asin 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 ++++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 66 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index daa94c6f7c..723c341c65 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -654,13 +654,75 @@ double CDECL MSVCRT_acos( double x ) /********************************************************************* * MSVCRT_asin (MSVCRT.@) + * + * Copied from musl: src/math/asin.c */ +static double asin_R(double z) +{ + /* coefficients for R(x^2) */ + static const double pS0 = 1.66666666666666657415e-01, + pS1 = -3.25565818622400915405e-01, + pS2 = 2.01212532134862925881e-01, + pS3 = -4.00555345006794114027e-02, + pS4 = 7.91534994289814532176e-04, + pS5 = 3.47933107596021167570e-05, + qS1 = -2.40339491173441421878e+00, + qS2 = 2.02094576023350569471e+00, + qS3 = -6.88283971605453293030e-01, + qS4 = 7.70381505559019352791e-02; + + double p, q; + p = z * (pS0 + z * (pS1 + z * (pS2 + z * (pS3 + z * (pS4 + z * pS5))))); + q = 1.0 + z * (qS1 + z * (qS2 + z * (qS3 + z * qS4))); + return p / q; +} + double CDECL MSVCRT_asin( double x ) { - double ret = atan2(x, sqrt((1 - x) * (1 + x))); - if (x < -1.0 || x > 1.0 || !isfinite(x)) - return math_error(_DOMAIN, "asin", x, 0, ret); - return ret; + static const double pio2_hi = 1.57079632679489655800e+00, + pio2_lo = 6.12323399573676603587e-17; + + double z, r, s; + unsigned int hx, ix; + ULONGLONG llx; + + hx = *(ULONGLONG*)&x >> 32; + ix = hx & 0x7fffffff; + /* |x| >= 1 or nan */ + if (ix >= 0x3ff00000) { + unsigned int lx; + lx = *(ULONGLONG*)&x; + if (((ix - 0x3ff00000) | lx) == 0) + /* asin(1) = +-pi/2 with inexact */ + return x * pio2_hi + 7.5231638452626401e-37; + if (isnan(x)) return x; + return math_error(_DOMAIN, "asin", x, 0, 0 / (x - x)); + } + /* |x| < 0.5 */ + if (ix < 0x3fe00000) { + /* if 0x1p-1022 <= |x| < 0x1p-26, avoid raising underflow */ + if (ix < 0x3e500000 && ix >= 0x00100000) + return x; + return x + x * asin_R(x * x); + } + /* 1 > |x| >= 0.5 */ + z = (1 - fabs(x)) * 0.5; + s = sqrt(z); + r = asin_R(z); + if (ix >= 0x3fef3333) { /* if |x| > 0.975 */ + x = pio2_hi - (2 * (s + s * r) - pio2_lo); + } else { + double f, c; + /* f+c = sqrt(z) */ + f = s; + llx = (*(ULONGLONG*)&f >> 32) << 32; + f = *(double*)&llx; + c = (z - f * f) / (s + f); + x = 0.5 * pio2_hi - (2 * s * r - (pio2_lo - 2 * c) - (0.5 * pio2_hi - 2 * f)); + } + if (hx >> 31) + return -x; + return x; } /*********************************************************************

1 0

Piotr Caban : msvcrt: Import atan2f from musl.
by Alexandre Julliard 06 Aug '20

06 Aug '20

Module: wine Branch: master Commit: 5eaa4c56b1232bf3c9a469b3c8d2314ebf5bb7e9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5eaa4c56b1232bf3c9a469b3… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Aug 6 16:59:21 2020 +0200 msvcrt: Import atan2f from musl. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 69 ++++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 65 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 723c341c65..73277a6a7b 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -340,12 +340,73 @@ float CDECL MSVCRT_atanf( float x ) /********************************************************************* * MSVCRT_atan2f (MSVCRT.@) + * + * Copied from musl: src/math/atan2f.c */ -float CDECL MSVCRT_atan2f( float x, float y ) +float CDECL MSVCRT_atan2f( float y, float x ) { - float ret = atan2f(x, y); - if (isnan(x)) return math_error(_DOMAIN, "atan2f", x, y, ret); - return ret; + static const float pi = 3.1415927410e+00, + pi_lo = -8.7422776573e-08; + + float z; + unsigned int m, ix, iy; + + if (MSVCRT__isnanf(x) || MSVCRT__isnanf(y)) + return x + y; + ix = *(unsigned int*)&x; + iy = *(unsigned int*)&y; + if (ix == 0x3f800000) /* x=1.0 */ + return atanf(y); + m = ((iy >> 31) & 1) | ((ix >> 30) & 2); /* 2*sign(x)+sign(y) */ + ix &= 0x7fffffff; + iy &= 0x7fffffff; + + /* when y = 0 */ + if (iy == 0) { + switch (m) { + case 0: + case 1: return y; /* atan(+-0,+anything)=+-0 */ + case 2: return pi; /* atan(+0,-anything) = pi */ + case 3: return -pi; /* atan(-0,-anything) =-pi */ + } + } + /* when x = 0 */ + if (ix == 0) + return m & 1 ? -pi / 2 : pi / 2; + /* when x is INF */ + if (ix == 0x7f800000) { + if (iy == 0x7f800000) { + switch (m) { + case 0: return pi / 4; /* atan(+INF,+INF) */ + case 1: return -pi / 4; /* atan(-INF,+INF) */ + case 2: return 3 * pi / 4; /*atan(+INF,-INF)*/ + case 3: return -3 * pi / 4; /*atan(-INF,-INF)*/ + } + } else { + switch (m) { + case 0: return 0.0f; /* atan(+...,+INF) */ + case 1: return -0.0f; /* atan(-...,+INF) */ + case 2: return pi; /* atan(+...,-INF) */ + case 3: return -pi; /* atan(-...,-INF) */ + } + } + } + /* |y/x| > 0x1p26 */ + if (ix + (26 << 23) < iy || iy == 0x7f800000) + return m & 1 ? -pi / 2 : pi / 2; + + /* z = atan(|y/x|) with correct underflow */ + if ((m & 2) && iy + (26 << 23) < ix) /*|y/x| < 0x1p-26, x < 0 */ + z = 0.0; + else + z = atanf(fabsf(y / x)); + switch (m) { + case 0: return z; /* atan(+,+) */ + case 1: return -z; /* atan(-,+) */ + case 2: return pi - (z - pi_lo); /* atan(+,-) */ + default: /* case 3 */ + return (z - pi_lo) - pi; /* atan(-,-) */ + } } /*********************************************************************

1 0

Piotr Caban : msvcrt: Import atan2 from musl.
by Alexandre Julliard 06 Aug '20

06 Aug '20

Module: wine Branch: master Commit: d9456a8cea2f9c8e7e65e2c706eb8d1a7a9c1966 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d9456a8cea2f9c8e7e65e2c7… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Aug 6 16:59:25 2020 +0200 msvcrt: Import atan2 from musl. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 71 +++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 67 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 73277a6a7b..85565d2bf3 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -798,12 +798,75 @@ double CDECL MSVCRT_atan( double x ) /********************************************************************* * MSVCRT_atan2 (MSVCRT.@) + * + * Copied from musl: src/math/atan2.c */ -double CDECL MSVCRT_atan2( double x, double y ) +double CDECL MSVCRT_atan2( double y, double x ) { - double ret = atan2(x, y); - if (isnan(x)) return math_error(_DOMAIN, "atan2", x, y, ret); - return ret; + static const double pi = 3.1415926535897931160E+00, + pi_lo = 1.2246467991473531772E-16; + + double z; + unsigned int m, lx, ly, ix, iy; + + if (isnan(x) || isnan(y)) + return x+y; + ix = *(ULONGLONG*)&x >> 32; + lx = *(ULONGLONG*)&x; + iy = *(ULONGLONG*)&y >> 32; + ly = *(ULONGLONG*)&y; + if (((ix - 0x3ff00000) | lx) == 0) /* x = 1.0 */ + return atan(y); + m = ((iy >> 31) & 1) | ((ix >> 30) & 2); /* 2*sign(x)+sign(y) */ + ix = ix & 0x7fffffff; + iy = iy & 0x7fffffff; + + /* when y = 0 */ + if ((iy | ly) == 0) { + switch(m) { + case 0: + case 1: return y; /* atan(+-0,+anything)=+-0 */ + case 2: return pi; /* atan(+0,-anything) = pi */ + case 3: return -pi; /* atan(-0,-anything) =-pi */ + } + } + /* when x = 0 */ + if ((ix | lx) == 0) + return m & 1 ? -pi / 2 : pi / 2; + /* when x is INF */ + if (ix == 0x7ff00000) { + if (iy == 0x7ff00000) { + switch(m) { + case 0: return pi / 4; /* atan(+INF,+INF) */ + case 1: return -pi / 4; /* atan(-INF,+INF) */ + case 2: return 3 * pi / 4; /* atan(+INF,-INF) */ + case 3: return -3 * pi / 4; /* atan(-INF,-INF) */ + } + } else { + switch(m) { + case 0: return 0.0; /* atan(+...,+INF) */ + case 1: return -0.0; /* atan(-...,+INF) */ + case 2: return pi; /* atan(+...,-INF) */ + case 3: return -pi; /* atan(-...,-INF) */ + } + } + } + /* |y/x| > 0x1p64 */ + if (ix + (64 << 20) < iy || iy == 0x7ff00000) + return m & 1 ? -pi / 2 : pi / 2; + + /* z = atan(|y/x|) without spurious underflow */ + if ((m & 2) && iy + (64 << 20) < ix) /* |y/x| < 0x1p-64, x<0 */ + z = 0; + else + z = atan(fabs(y / x)); + switch (m) { + case 0: return z; /* atan(+,+) */ + case 1: return -z; /* atan(-,+) */ + case 2: return pi - (z - pi_lo); /* atan(+,-) */ + default: /* case 3 */ + return (z - pi_lo) - pi; /* atan(-,-) */ + } } /*********************************************************************

1 0

Piotr Caban : msvcrt: Import atanf from musl.
by Alexandre Julliard 06 Aug '20

06 Aug '20

Module: wine Branch: master Commit: 18fa9cf624467c4a3549c1fd9868104e6a49fde3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=18fa9cf624467c4a3549c1fd… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Aug 6 16:59:29 2020 +0200 msvcrt: Import atanf from musl. 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, 82 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 85565d2bf3..5fbb93ea16 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -330,12 +330,91 @@ float CDECL MSVCRT_asinf( float x ) /********************************************************************* * MSVCRT_atanf (MSVCRT.@) + * + * Copied from musl: src/math/atanf.c */ +static inline float fp_barrierf(float x) +{ + volatile float y = x; + return y; +} float CDECL MSVCRT_atanf( float x ) { - float ret = atanf(x); - if (!finitef(x)) return math_error(_DOMAIN, "atanf", x, 0, ret); - return ret; + static const float atanhi[] = { + 4.6364760399e-01, + 7.8539812565e-01, + 9.8279368877e-01, + 1.5707962513e+00, + }; + static const float atanlo[] = { + 5.0121582440e-09, + 3.7748947079e-08, + 3.4473217170e-08, + 7.5497894159e-08, + }; + static const float aT[] = { + 3.3333328366e-01, + -1.9999158382e-01, + 1.4253635705e-01, + -1.0648017377e-01, + 6.1687607318e-02, + }; + + float w, s1, s2, z; + unsigned int ix, sign; + int id; + +#if _MSVCR_VER == 0 + if (MSVCRT__isnanf(x)) return math_error(_DOMAIN, "atanf", x, 0, x); +#endif + + ix = *(unsigned int*)&x; + sign = ix >> 31; + ix &= 0x7fffffff; + if (ix >= 0x4c800000) { /* if |x| >= 2**26 */ + if (MSVCRT__isnanf(x)) + return x; + z = atanhi[3] + 7.5231638453e-37; + return sign ? -z : z; + } + if (ix < 0x3ee00000) { /* |x| < 0.4375 */ + if (ix < 0x39800000) { /* |x| < 2**-12 */ + if (ix < 0x00800000) + /* raise underflow for subnormal x */ + fp_barrierf(x*x); + return x; + } + id = -1; + } else { + x = fabsf(x); + if (ix < 0x3f980000) { /* |x| < 1.1875 */ + if (ix < 0x3f300000) { /* 7/16 <= |x| < 11/16 */ + id = 0; + x = (2.0f * x - 1.0f) / (2.0f + x); + } else { /* 11/16 <= |x| < 19/16 */ + id = 1; + x = (x - 1.0f) / (x + 1.0f); + } + } else { + if (ix < 0x401c0000) { /* |x| < 2.4375 */ + id = 2; + x = (x - 1.5f) / (1.0f + 1.5f * x); + } else { /* 2.4375 <= |x| < 2**26 */ + id = 3; + x = -1.0f / x; + } + } + } + /* end of argument reduction */ + z = x * x; + w = z * z; + /* break sum from i=0 to 10 aT[i]z**(i+1) into odd and even poly */ + s1 = z * (aT[0] + w * (aT[2] + w * aT[4])); + s2 = w * (aT[1] + w * aT[3]); + if (id < 0) + return x - x * (s1 + s2); + z = atanhi[id] - ((x * (s1 + s2) - atanlo[id]) - x); + return sign ? -z : z; } /*********************************************************************

1 0

Piotr Caban : msvcrt: Import atan from musl.
by Alexandre Julliard 06 Aug '20

06 Aug '20

Module: wine Branch: master Commit: 8cbbb4f394678411fdb57237553f5d974527877f URL: https://source.winehq.org/git/wine.git/?a=commit;h=8cbbb4f394678411fdb57237… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Aug 6 16:59:33 2020 +0200 msvcrt: Import atan from musl. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 98 +++++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 90 insertions(+), 8 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 5fbb93ea16..6898b38641 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -74,6 +74,13 @@ void msvcrt_init_math(void) sse2_supported = sse2_enabled = IsProcessorFeaturePresent( PF_XMMI64_INSTRUCTIONS_AVAILABLE ); } +/* Copied from musl: src/internal/libm.h */ +static inline float fp_barrierf(float x) +{ + volatile float y = x; + return y; +} + /********************************************************************* * _matherr (CRTDLL.@) */ @@ -333,11 +340,6 @@ float CDECL MSVCRT_asinf( float x ) * * Copied from musl: src/math/atanf.c */ -static inline float fp_barrierf(float x) -{ - volatile float y = x; - return y; -} float CDECL MSVCRT_atanf( float x ) { static const float atanhi[] = { @@ -867,12 +869,92 @@ double CDECL MSVCRT_asin( double x ) /********************************************************************* * MSVCRT_atan (MSVCRT.@) + * + * Copied from musl: src/math/atan.c */ double CDECL MSVCRT_atan( double x ) { - double ret = atan(x); - if (isnan(x)) return math_error(_DOMAIN, "atan", x, 0, ret); - return ret; + static const double atanhi[] = { + 4.63647609000806093515e-01, + 7.85398163397448278999e-01, + 9.82793723247329054082e-01, + 1.57079632679489655800e+00, + }; + static const double atanlo[] = { + 2.26987774529616870924e-17, + 3.06161699786838301793e-17, + 1.39033110312309984516e-17, + 6.12323399573676603587e-17, + }; + static const double aT[] = { + 3.33333333333329318027e-01, + -1.99999999998764832476e-01, + 1.42857142725034663711e-01, + -1.11111104054623557880e-01, + 9.09088713343650656196e-02, + -7.69187620504482999495e-02, + 6.66107313738753120669e-02, + -5.83357013379057348645e-02, + 4.97687799461593236017e-02, + -3.65315727442169155270e-02, + 1.62858201153657823623e-02, + }; + + double w, s1, s2, z; + unsigned int ix, sign; + int id; + +#if _MSVCR_VER == 0 + if (isnan(x)) return math_error(_DOMAIN, "atan", x, 0, x); +#endif + + ix = *(ULONGLONG*)&x >> 32; + sign = ix >> 31; + ix &= 0x7fffffff; + if (ix >= 0x44100000) { /* if |x| >= 2^66 */ + if (isnan(x)) + return x; + z = atanhi[3] + 7.5231638452626401e-37; + return sign ? -z : z; + } + if (ix < 0x3fdc0000) { /* |x| < 0.4375 */ + if (ix < 0x3e400000) { /* |x| < 2^-27 */ + if (ix < 0x00100000) + /* raise underflow for subnormal x */ + fp_barrierf((float)x); + return x; + } + id = -1; + } else { + x = fabs(x); + if (ix < 0x3ff30000) { /* |x| < 1.1875 */ + if (ix < 0x3fe60000) { /* 7/16 <= |x| < 11/16 */ + id = 0; + x = (2.0 * x - 1.0) / (2.0 + x); + } else { /* 11/16 <= |x| < 19/16 */ + id = 1; + x = (x - 1.0) / (x + 1.0); + } + } else { + if (ix < 0x40038000) { /* |x| < 2.4375 */ + id = 2; + x = (x - 1.5) / (1.0 + 1.5 * x); + } else { /* 2.4375 <= |x| < 2^66 */ + id = 3; + x = -1.0 / x; + } + } + } + /* end of argument reduction */ + z = x * x; + w = z * z; + /* break sum from i=0 to 10 aT[i]z**(i+1) into odd and even poly */ + s1 = z * (aT[0] + w * (aT[2] + w * (aT[4] + w * (aT[6] + w * (aT[8] + w * aT[10]))))); + s2 = w * (aT[1] + w * (aT[3] + w * (aT[5] + w * (aT[7] + w * aT[9])))); + if (id < 0) + return x - x * (s1 + s2); + z = atanhi[id] - (x * (s1 + s2) - atanlo[id] - x); + return sign ? -z : z; } /*********************************************************************

1 0

Michael Müller : fsutil: Print out usage message.
by Alexandre Julliard 06 Aug '20

06 Aug '20

1 0

Michael Müller : fsutil: Add support for creating hardlinks.
by Alexandre Julliard 06 Aug '20

06 Aug '20

1 0

Alexandre Julliard : ntdll: Implement KiUserApcDispatcher().
by Alexandre Julliard 06 Aug '20

06 Aug '20

Module: wine Branch: master Commit: 2a08e0e29025f335acd77f7d899afa7f45240b2b URL: https://source.winehq.org/git/wine.git/?a=commit;h=2a08e0e29025f335acd77f7d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 6 19:31:06 2020 +0200 ntdll: Implement KiUserApcDispatcher(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 2 +- dlls/ntdll/thread.c | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 57811e87fd..2a95dddf20 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -67,7 +67,7 @@ # @ stub KiFastSystemCallRet # @ stub KiIntSystemCall @ stdcall -norelay KiRaiseUserExceptionDispatcher() -@ stub KiUserApcDispatcher +@ stdcall -norelay KiUserApcDispatcher(ptr long long long ptr) @ stub KiUserCallbackDispatcher @ stdcall -norelay KiUserExceptionDispatcher(ptr ptr) # @ stub LdrAccessOutOfProcessResource diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 25032ec4d0..ab34f0ba96 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -74,6 +74,17 @@ int __cdecl __wine_dbg_output( const char *str ) } +/******************************************************************* + * KiUserApcDispatcher (NTDLL.@) + */ +void WINAPI KiUserApcDispatcher( CONTEXT *context, ULONG_PTR ctx, ULONG_PTR arg1, ULONG_PTR arg2, + PNTAPCFUNC func ) +{ + func( ctx, arg1, arg2 ); + NtContinue( context, TRUE ); +} + + /*********************************************************************** * RtlExitUserThread (NTDLL.@) */

1 0

Alexandre Julliard : ntdll: Use KiUserApcDispatcher() to call user APCs.
by Alexandre Julliard 06 Aug '20

06 Aug '20

Module: wine Branch: master Commit: 7a71f98640bf8fa402d6b0c3ec30b40818710ee7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7a71f98640bf8fa402d6b0c3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 6 19:31:24 2020 +0200 ntdll: Use KiUserApcDispatcher() to call user APCs. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/loader.c | 2 ++ dlls/ntdll/unix/server.c | 51 ++++++++++++++++++----------------------- dlls/ntdll/unix/signal_arm.c | 23 +++++++++++++++++++ dlls/ntdll/unix/signal_arm64.c | 23 +++++++++++++++++++ dlls/ntdll/unix/signal_i386.c | 25 +++++++++++++++++++- dlls/ntdll/unix/signal_x86_64.c | 24 +++++++++++++++++++ dlls/ntdll/unix/thread.c | 12 ---------- dlls/ntdll/unix/unix_private.h | 3 +++ 8 files changed, 121 insertions(+), 42 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7a71f98640bf8fa402d6…

1 0

Dmitry Kislyuk : vbscript: Return correct error for null start in InStr and more tests.
by Alexandre Julliard 06 Aug '20

06 Aug '20

Module: wine Branch: master Commit: 120b2209794f346c072f5064e97b54c3378c329f URL: https://source.winehq.org/git/wine.git/?a=commit;h=120b2209794f346c072f5064… Author: Dmitry Kislyuk <dimaki(a)rocketmail.com> Date: Wed Aug 5 14:53:31 2020 -0500 vbscript: Return correct error for null start in InStr and more tests. Signed-off-by: Dmitry Kislyuk <dimaki(a)rocketmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/global.c | 3 +++ dlls/vbscript/tests/api.vbs | 28 ++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index abb4b7933b..414ede5ed0 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -1662,6 +1662,9 @@ static HRESULT Global_InStr(BuiltinDisp *This, VARIANT *args, unsigned args_cnt, } if(startv) { + if(V_VT(startv) == VT_NULL) + return MAKE_VBSERROR(VBSE_ILLEGAL_NULL_USE); + hres = to_int(startv, &start); if(FAILED(hres)) return hres; diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index 0c37c3c843..f829afc101 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -435,6 +435,34 @@ Call ok(x = 3, "InStr returned " & x) x = InStr(1, "23456", 34, 1) Call ok(x = 2, "InStr returned " & x) +x = InStr(2, "", "abcd", 0) +Call ok(x = 0, "InStr returned " & x) + +x = InStr(4, "abcdef", "", 0) +Call ok(x = 4, "InStr returned " & x) + +x = InStr(20, "abcdef", "", 0) +Call ok(x = 0, "InStr returned " & x) + +x = InStr(4, "", "", 0) +Call ok(x = 0, "InStr returned " & x) + +Sub testInStrError(arg1, arg2, arg3, arg4, error_num) + on error resume next + Dim x + + Call Err.clear() + x = InStr(arg1, arg2, arg3, arg4) + Call ok(Err.number = error_num, "Err.number = " & Err.number) +End Sub + +call testInStrError(2, "abcd", null, 0, 0) +call testInStrError(2, Null, "abcd", 0, 0) +call testInStrError(Null, "abcd", "abcd", 0, 94) +call testInStrError(2, "abcd", "abcd", null, 94) +call testInStrError(-20, "abcd", "abcd", 1, 5) +Call testInStrError(2, "abcd", "abcd", 10, 5) + x = InStrRev("bcabcd", "bc") Call ok(x = 4, "InStrRev returned " & x)

1 0