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

Piotr Caban : msvcrt: Import yn implementation from musl.
by Alexandre Julliard 29 Apr '21

29 Apr '21

Module: wine Branch: master Commit: 30200117d2c3b0fd500deb375f58bafdb529fe6c URL: https://source.winehq.org/git/wine.git/?a=commit;h=30200117d2c3b0fd500deb37… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 29 17:06:25 2021 +0200 msvcrt: Import yn implementation from musl. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 3 +-- configure.ac | 3 +-- dlls/msvcrt/math.c | 72 ++++++++++++++++++++++++++++++++++++++++++++------- dlls/msvcrt/unixlib.c | 16 +----------- dlls/msvcrt/unixlib.h | 1 - include/config.h.in | 3 --- 6 files changed, 65 insertions(+), 33 deletions(-) diff --git a/configure b/configure index 33e79ad04a4..429d97ebfdc 100755 --- a/configure +++ b/configure @@ -19660,8 +19660,7 @@ for ac_func in \ tgamma \ tgammaf \ trunc \ - truncf \ - yn + truncf do : as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` diff --git a/configure.ac b/configure.ac index 550da301100..e9dde0f9781 100644 --- a/configure.ac +++ b/configure.ac @@ -2703,8 +2703,7 @@ AC_CHECK_FUNCS(\ tgamma \ tgammaf \ trunc \ - truncf \ - yn + truncf ) LIBS="$ac_save_LIBS" diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 019fb836c07..5a0c0874ee5 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -3135,19 +3135,71 @@ double CDECL _y1(double x) /********************************************************************* * _yn (MSVCRT.@) + * + * Copied from musl: src/math/jn.c */ -double CDECL _yn(int order, double num) +double CDECL _yn(int n, double x) { - double retval; + static const double invsqrtpi = 5.64189583547756279280e-01; - if (!isfinite(num)) *_errno() = EDOM; - retval = unix_funcs->yn( order, num ); - if (_fpclass(retval) == _FPCLASS_NINF) - { - *_errno() = EDOM; - retval = NAN; - } - return retval; + unsigned int ix, lx, ib; + int nm1, sign, i; + double a, b, temp; + + ix = *(ULONGLONG*)&x >> 32; + lx = *(ULONGLONG*)&x; + sign = ix >> 31; + ix &= 0x7fffffff; + + if ((ix | (lx | -lx) >> 31) > 0x7ff00000) /* nan */ + return x; + if (sign && (ix | lx) != 0) /* x < 0 */ + return math_error(_DOMAIN, "_y1", x, 0, 0 / (x - x)); + if (ix == 0x7ff00000) + return 0.0; + + if (n == 0) + return y0(x); + if (n < 0) { + nm1 = -(n + 1); + sign = n & 1; + } else { + nm1 = n - 1; + sign = 0; + } + if (nm1 == 0) + return sign ? -y1(x) : y1(x); + + if (ix >= 0x52d00000) { /* x > 2**302 */ + switch(nm1 & 3) { + case 0: + temp = -sin(x) - cos(x); + break; + case 1: + temp = -sin(x) + cos(x); + break; + case 2: + temp = sin(x) + cos(x); + break; + default: + temp = sin(x) - cos(x); + break; + } + b = invsqrtpi * temp / sqrt(x); + } else { + a = y0(x); + b = y1(x); + /* quit if b is -inf */ + ib = *(ULONGLONG*)&b >> 32; + for (i = 0; i < nm1 && ib != 0xfff00000;) { + i++; + temp = b; + b = (2.0 * i / x) * b - a; + ib = *(ULONGLONG*)&b >> 32; + a = temp; + } + } + return sign ? -b : b; } #if _MSVCR_VER>=120 diff --git a/dlls/msvcrt/unixlib.c b/dlls/msvcrt/unixlib.c index c5e62613940..d62110c0006 100644 --- a/dlls/msvcrt/unixlib.c +++ b/dlls/msvcrt/unixlib.c @@ -939,19 +939,6 @@ static float CDECL unix_tgammaf(float x) #endif } -/********************************************************************* - * yn - */ -static double CDECL unix_yn(int order, double num) -{ -#ifdef HAVE_YN - return yn(order,num); -#else - FIXME("not implemented\n"); - return 0; -#endif -} - static const struct unix_funcs funcs = { unix_acosh, @@ -1038,8 +1025,7 @@ static const struct unix_funcs funcs = unix_tgamma, unix_tgammaf, unix_trunc, - unix_truncf, - unix_yn + unix_truncf }; NTSTATUS CDECL __wine_init_unix_lib( HMODULE module, DWORD reason, const void *ptr_in, void *ptr_out ) diff --git a/dlls/msvcrt/unixlib.h b/dlls/msvcrt/unixlib.h index 48fc075d530..5f1f79d5e4b 100644 --- a/dlls/msvcrt/unixlib.h +++ b/dlls/msvcrt/unixlib.h @@ -108,7 +108,6 @@ struct unix_funcs float (CDECL *tgammaf)(float x); double (CDECL *trunc)(double x); float (CDECL *truncf)(float x); - double (CDECL *yn)(int order, double num); }; #endif /* __UNIXLIB_H */ diff --git a/include/config.h.in b/include/config.h.in index 197d5c4b5f7..11f29fcf8bc 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -1166,9 +1166,6 @@ /* Define if Xrandr has the XRRGetProviderResources function */ #undef HAVE_XRRGETPROVIDERRESOURCES -/* Define to 1 if you have the `yn' function. */ -#undef HAVE_YN - /* Define to 1 if you have the `_spawnvp' function. */ #undef HAVE__SPAWNVP

1 0

Piotr Caban : msvcrt: Import roundf implementation from musl.
by Alexandre Julliard 29 Apr '21

29 Apr '21

Module: wine Branch: master Commit: 833e8cdd42a59df471f493e906efa3501adcd142 URL: https://source.winehq.org/git/wine.git/?a=commit;h=833e8cdd42a59df471f493e9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 29 17:06:27 2021 +0200 msvcrt: Import roundf 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 | 25 ++++++++++++++++++++++++- dlls/msvcrt/unixlib.c | 13 ------------- dlls/msvcrt/unixlib.h | 1 - include/config.h.in | 3 --- 6 files changed, 24 insertions(+), 20 deletions(-) diff --git a/configure b/configure index 429d97ebfdc..1ff743f0328 100755 --- a/configure +++ b/configure @@ -19656,7 +19656,6 @@ for ac_func in \ rint \ rintf \ round \ - roundf \ tgamma \ tgammaf \ trunc \ diff --git a/configure.ac b/configure.ac index e9dde0f9781..8ce76f1d645 100644 --- a/configure.ac +++ b/configure.ac @@ -2699,7 +2699,6 @@ AC_CHECK_FUNCS(\ rint \ rintf \ round \ - roundf \ tgamma \ tgammaf \ trunc \ diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 5a0c0874ee5..586f8950e0a 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -4329,10 +4329,33 @@ double CDECL round(double x) /********************************************************************* * roundf (MSVCR120.@) + * + * Copied from musl: src/math/roundf.c */ float CDECL roundf(float x) { - return unix_funcs->roundf(x); + static const float toint = 1 / FLT_EPSILON; + + unsigned int ix = *(unsigned int*)&x; + int e = ix >> 23 & 0xff; + float y; + + if (e >= 0x7f + 23) + return x; + if (ix >> 31) + x = -x; + if (e < 0x7f - 1) + return 0 * *(float*)&ix; + y = fp_barrierf(x + toint) - toint - x; + if (y > 0.5f) + y = y + x - 1; + else if (y <= -0.5f) + y = y + x + 1; + else + y = y + x; + if (ix >> 31) + y = -y; + return y; } /********************************************************************* diff --git a/dlls/msvcrt/unixlib.c b/dlls/msvcrt/unixlib.c index d62110c0006..456cb3de574 100644 --- a/dlls/msvcrt/unixlib.c +++ b/dlls/msvcrt/unixlib.c @@ -765,18 +765,6 @@ static double CDECL unix_round(double x) #endif } -/********************************************************************* - * roundf - */ -static float CDECL unix_roundf(float x) -{ -#ifdef HAVE_ROUNDF - return roundf(x); -#else - return unix_round(x); -#endif -} - /********************************************************************* * lround */ @@ -1013,7 +1001,6 @@ static const struct unix_funcs funcs = unix_rint, unix_rintf, unix_round, - unix_roundf, unix_sin, unix_sinf, unix_sinh, diff --git a/dlls/msvcrt/unixlib.h b/dlls/msvcrt/unixlib.h index 5f1f79d5e4b..2841a28f478 100644 --- a/dlls/msvcrt/unixlib.h +++ b/dlls/msvcrt/unixlib.h @@ -95,7 +95,6 @@ struct unix_funcs double (CDECL *rint)(double x); float (CDECL *rintf)(float x); double (CDECL *round)(double x); - float (CDECL *roundf)(float x); 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 11f29fcf8bc..749b79e1092 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -705,9 +705,6 @@ /* Define to 1 if you have the `round' function. */ #undef HAVE_ROUND -/* Define to 1 if you have the `roundf' function. */ -#undef HAVE_ROUNDF - /* Define to 1 if you have the <sasl/sasl.h> header file. */ #undef HAVE_SASL_SASL_H

1 0

Piotr Caban : msvcrt: Import llroundf implementation from musl.
by Alexandre Julliard 29 Apr '21

29 Apr '21

Module: wine Branch: master Commit: 668cf2e66d3665612503b2bc2a4f254b3a7fa553 URL: https://source.winehq.org/git/wine.git/?a=commit;h=668cf2e66d3665612503b2bc… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 29 17:06:30 2021 +0200 msvcrt: Import llroundf 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 | 9 ++++++++- dlls/msvcrt/unixlib.c | 13 ------------- dlls/msvcrt/unixlib.h | 1 - include/config.h.in | 3 --- 6 files changed, 8 insertions(+), 20 deletions(-) diff --git a/configure b/configure index 1ff743f0328..61ff110a9d4 100755 --- a/configure +++ b/configure @@ -19636,7 +19636,6 @@ for ac_func in \ llrint \ llrintf \ llround \ - llroundf \ log1p \ log1pf \ log2 \ diff --git a/configure.ac b/configure.ac index 8ce76f1d645..a8842bcb52a 100644 --- a/configure.ac +++ b/configure.ac @@ -2679,7 +2679,6 @@ AC_CHECK_FUNCS(\ llrint \ llrintf \ llround \ - llroundf \ log1p \ log1pf \ log2 \ diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 586f8950e0a..e5c2ed66d2b 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -4384,10 +4384,17 @@ __int64 CDECL llround(double x) /********************************************************************* * llroundf (MSVCR120.@) + * + * Copied from musl: src/math/llroundf.c */ __int64 CDECL llroundf(float x) { - return unix_funcs->llroundf( x ); + float f = roundf(x); + if (f != (float)(__int64)f) { + *_errno() = EDOM; + return 0; + } + return f; } /********************************************************************* diff --git a/dlls/msvcrt/unixlib.c b/dlls/msvcrt/unixlib.c index 456cb3de574..e23456e8250 100644 --- a/dlls/msvcrt/unixlib.c +++ b/dlls/msvcrt/unixlib.c @@ -801,18 +801,6 @@ static __int64 CDECL unix_llround(double x) #endif } -/********************************************************************* - * llroundf - */ -static __int64 CDECL unix_llroundf(float x) -{ -#ifdef HAVE_LLROUNDF - return llroundf(x); -#else - return unix_llround(x); -#endif -} - /********************************************************************* * sin */ @@ -969,7 +957,6 @@ static const struct unix_funcs funcs = unix_llrint, unix_llrintf, unix_llround, - unix_llroundf, unix_log, unix_logf, unix_log10, diff --git a/dlls/msvcrt/unixlib.h b/dlls/msvcrt/unixlib.h index 2841a28f478..db090a9a2aa 100644 --- a/dlls/msvcrt/unixlib.h +++ b/dlls/msvcrt/unixlib.h @@ -63,7 +63,6 @@ struct unix_funcs __int64 (CDECL *llrint)(double x); __int64 (CDECL *llrintf)(float x); __int64 (CDECL *llround)(double x); - __int64 (CDECL *llroundf)(float x); double (CDECL *log)(double x); float (CDECL *logf)(float x); double (CDECL *log10)(double x); diff --git a/include/config.h.in b/include/config.h.in index 749b79e1092..25c4e3f42ec 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -462,9 +462,6 @@ /* Define to 1 if you have the `llround' function. */ #undef HAVE_LLROUND -/* Define to 1 if you have the `llroundf' function. */ -#undef HAVE_LLROUNDF - /* Define to 1 if you have the `log1p' function. */ #undef HAVE_LOG1P

1 0

Piotr Caban : msvcrt: Import llround implementation from musl.
by Alexandre Julliard 29 Apr '21

29 Apr '21

Module: wine Branch: master Commit: 389e0532fe2ae0eac770c90df31773a3c6c91a47 URL: https://source.winehq.org/git/wine.git/?a=commit;h=389e0532fe2ae0eac770c90d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 29 17:06:33 2021 +0200 msvcrt: Import llround 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 | 9 ++++++++- dlls/msvcrt/unixlib.c | 13 ------------- dlls/msvcrt/unixlib.h | 1 - include/config.h.in | 3 --- 6 files changed, 8 insertions(+), 20 deletions(-) diff --git a/configure b/configure index 61ff110a9d4..690f9333f14 100755 --- a/configure +++ b/configure @@ -19635,7 +19635,6 @@ for ac_func in \ lgammaf \ llrint \ llrintf \ - llround \ log1p \ log1pf \ log2 \ diff --git a/configure.ac b/configure.ac index a8842bcb52a..b0977c112b4 100644 --- a/configure.ac +++ b/configure.ac @@ -2678,7 +2678,6 @@ AC_CHECK_FUNCS(\ lgammaf \ llrint \ llrintf \ - llround \ log1p \ log1pf \ log2 \ diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index e5c2ed66d2b..c8dd53cf095 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -4376,10 +4376,17 @@ __msvcrt_long CDECL lroundf(float x) /********************************************************************* * llround (MSVCR120.@) + * + * Copied from musl: src/math/llround.c */ __int64 CDECL llround(double x) { - return unix_funcs->llround( x ); + double d = round(x); + if (d != (double)(__int64)d) { + *_errno() = EDOM; + return 0; + } + return d; } /********************************************************************* diff --git a/dlls/msvcrt/unixlib.c b/dlls/msvcrt/unixlib.c index e23456e8250..e3ddd486e93 100644 --- a/dlls/msvcrt/unixlib.c +++ b/dlls/msvcrt/unixlib.c @@ -789,18 +789,6 @@ static int CDECL unix_lroundf(float x) #endif } -/********************************************************************* - * llround - */ -static __int64 CDECL unix_llround(double x) -{ -#ifdef HAVE_LLROUND - return llround(x); -#else - return unix_round(x); -#endif -} - /********************************************************************* * sin */ @@ -956,7 +944,6 @@ static const struct unix_funcs funcs = unix_lgammaf, unix_llrint, unix_llrintf, - unix_llround, unix_log, unix_logf, unix_log10, diff --git a/dlls/msvcrt/unixlib.h b/dlls/msvcrt/unixlib.h index db090a9a2aa..49ec319d219 100644 --- a/dlls/msvcrt/unixlib.h +++ b/dlls/msvcrt/unixlib.h @@ -62,7 +62,6 @@ struct unix_funcs float (CDECL *lgammaf)(float x); __int64 (CDECL *llrint)(double x); __int64 (CDECL *llrintf)(float x); - __int64 (CDECL *llround)(double x); double (CDECL *log)(double x); float (CDECL *logf)(float x); double (CDECL *log10)(double x); diff --git a/include/config.h.in b/include/config.h.in index 25c4e3f42ec..71f9f4350b0 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -459,9 +459,6 @@ /* Define to 1 if you have the `llrintf' function. */ #undef HAVE_LLRINTF -/* Define to 1 if you have the `llround' function. */ -#undef HAVE_LLROUND - /* Define to 1 if you have the `log1p' function. */ #undef HAVE_LOG1P

1 0

Piotr Caban : msvcrt: Import lroundf implementation from musl.
by Alexandre Julliard 29 Apr '21

29 Apr '21

Module: wine Branch: master Commit: 7fa8b03cd3ff16664bd3bfb3286dff1346e5dc08 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7fa8b03cd3ff16664bd3bfb3… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 29 17:06:35 2021 +0200 msvcrt: Import lroundf 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 | 9 ++++++++- dlls/msvcrt/unixlib.c | 13 ------------- dlls/msvcrt/unixlib.h | 1 - include/config.h.in | 3 --- 6 files changed, 8 insertions(+), 20 deletions(-) diff --git a/configure b/configure index 690f9333f14..794a3e09c29 100755 --- a/configure +++ b/configure @@ -19642,7 +19642,6 @@ for ac_func in \ lrint \ lrintf \ lround \ - lroundf \ nearbyint \ nearbyintf \ nexttoward \ diff --git a/configure.ac b/configure.ac index b0977c112b4..3bfa2885002 100644 --- a/configure.ac +++ b/configure.ac @@ -2685,7 +2685,6 @@ AC_CHECK_FUNCS(\ lrint \ lrintf \ lround \ - lroundf \ nearbyint \ nearbyintf \ nexttoward \ diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index c8dd53cf095..e1251ba7115 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -4368,10 +4368,17 @@ __msvcrt_long CDECL lround(double x) /********************************************************************* * lroundf (MSVCR120.@) + * + * Copied from musl: src/math/lroundf.c */ __msvcrt_long CDECL lroundf(float x) { - return unix_funcs->lroundf( x ); + float f = roundf(x); + if (f != (float)(__msvcrt_long)f) { + *_errno() = EDOM; + return 0; + } + return f; } /********************************************************************* diff --git a/dlls/msvcrt/unixlib.c b/dlls/msvcrt/unixlib.c index e3ddd486e93..3bf99c09c24 100644 --- a/dlls/msvcrt/unixlib.c +++ b/dlls/msvcrt/unixlib.c @@ -777,18 +777,6 @@ static int CDECL unix_lround(double x) #endif } -/********************************************************************* - * lroundf - */ -static int CDECL unix_lroundf(float x) -{ -#ifdef HAVE_LROUNDF - return lroundf(x); -#else - return unix_lround(x); -#endif -} - /********************************************************************* * sin */ @@ -957,7 +945,6 @@ static const struct unix_funcs funcs = unix_lrint, unix_lrintf, unix_lround, - unix_lroundf, unix_modf, unix_modff, unix_nearbyint, diff --git a/dlls/msvcrt/unixlib.h b/dlls/msvcrt/unixlib.h index 49ec319d219..c74115bc76c 100644 --- a/dlls/msvcrt/unixlib.h +++ b/dlls/msvcrt/unixlib.h @@ -75,7 +75,6 @@ struct unix_funcs int (CDECL *lrint)(double x); int (CDECL *lrintf)(float x); int (CDECL *lround)(double x); - int (CDECL *lroundf)(float x); double (CDECL *modf)(double x, double *iptr); float (CDECL *modff)(float x, float *iptr); double (CDECL *nearbyint)(double num); diff --git a/include/config.h.in b/include/config.h.in index 71f9f4350b0..544fe85b248 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -480,9 +480,6 @@ /* Define to 1 if you have the `lround' function. */ #undef HAVE_LROUND -/* Define to 1 if you have the `lroundf' function. */ -#undef HAVE_LROUNDF - /* Define to 1 if you have the `lstat' function. */ #undef HAVE_LSTAT

1 0

Alexandre Julliard : regsvr32: Restart the correct version for all supported architectures.
by Alexandre Julliard 29 Apr '21

29 Apr '21

Module: wine Branch: master Commit: 20984f2e1f7f6445a5b6bcdf8aa1354c8d539128 URL: https://source.winehq.org/git/wine.git/?a=commit;h=20984f2e1f7f6445a5b6bcdf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 29 17:09:06 2021 +0200 regsvr32: Restart the correct version for all supported architectures. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regsvr32/Makefile.in | 2 +- programs/regsvr32/regsvr32.c | 51 ++++++++++++++++--------------------------- 2 files changed, 20 insertions(+), 33 deletions(-) diff --git a/programs/regsvr32/Makefile.in b/programs/regsvr32/Makefile.in index d8aee0ea666..3321ca68a94 100644 --- a/programs/regsvr32/Makefile.in +++ b/programs/regsvr32/Makefile.in @@ -1,5 +1,5 @@ MODULE = regsvr32.exe -IMPORTS = ole32 user32 +IMPORTS = ole32 user32 kernelbase EXTRADLLFLAGS = -mwindows -municode -mno-cygwin diff --git a/programs/regsvr32/regsvr32.c b/programs/regsvr32/regsvr32.c index ee915ed3e21..fb307d797a1 100644 --- a/programs/regsvr32/regsvr32.c +++ b/programs/regsvr32/regsvr32.c @@ -112,46 +112,39 @@ static LPCWSTR find_arg_start(LPCWSTR cmdline) return s; } -static void reexec_self(void) +static void reexec_self( WORD machine ) { - /* restart current process as 32-bit or 64-bit with same command line */ -#ifndef _WIN64 - BOOL wow64; -#endif - WCHAR systemdir[MAX_PATH]; + WCHAR app[MAX_PATH]; LPCWSTR args; WCHAR *cmdline; + ULONG i, machines[8]; + HANDLE process = 0; STARTUPINFOW si = {0}; PROCESS_INFORMATION pi; + void *cookie; -#ifdef _WIN64 - TRACE("restarting as 32-bit\n"); - GetSystemWow64DirectoryW(systemdir, MAX_PATH); -#else - TRACE("restarting as 64-bit\n"); + NtQuerySystemInformationEx( SystemSupportedProcessorArchitectures, &process, sizeof(process), + machines, sizeof(machines), NULL ); + for (i = 0; machines[i]; i++) if (LOWORD(machines[i]) == machine) break; + if (!machines[i]) return; + if (HIWORD(machines[i]) & 4 /* native machine */) machine = IMAGE_FILE_MACHINE_TARGET_HOST; + if (!GetSystemWow64Directory2W( app, MAX_PATH, machine )) return; + wcscat( app, L"\\regsvr32.exe" ); - if (!IsWow64Process(GetCurrentProcess(), &wow64) || !wow64) - { - TRACE("not running in wow64, can't restart as 64-bit\n"); - return; - } - - GetWindowsDirectoryW(systemdir, MAX_PATH); - wcscat(systemdir, L"\\SysNative"); -#endif + TRACE( "restarting as %s\n", debugstr_w(app) ); args = find_arg_start(GetCommandLineW()); cmdline = HeapAlloc(GetProcessHeap(), 0, - (wcslen(systemdir)+wcslen(L"\\regsvr32.exe")+wcslen(args)+1)*sizeof(WCHAR)); + (wcslen(app)+wcslen(args)+1)*sizeof(WCHAR)); - wcscpy(cmdline, systemdir); - wcscat(cmdline, L"\\regsvr32.exe"); + wcscpy(cmdline, app); wcscat(cmdline, args); si.cb = sizeof(si); - if (CreateProcessW(NULL, cmdline, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi)) + Wow64DisableWow64FsRedirection(&cookie); + if (CreateProcessW(app, cmdline, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi)) { DWORD exit_code; WaitForSingleObject(pi.hProcess, INFINITE); @@ -162,16 +155,10 @@ static void reexec_self(void) { WINE_TRACE("failed to restart, err=%d\n", GetLastError()); } - + Wow64RevertWow64FsRedirection(cookie); HeapFree(GetProcessHeap(), 0, cmdline); } -#ifdef _WIN64 -# define ALT_MACHINE IMAGE_FILE_MACHINE_I386 -#else -# define ALT_MACHINE IMAGE_FILE_MACHINE_AMD64 -#endif - /** * Loads procedure. * @@ -193,7 +180,7 @@ static VOID *LoadProc(const WCHAR* strDll, const char* procName, HMODULE* DllHan (module = LoadLibraryExW(strDll, 0, LOAD_LIBRARY_AS_IMAGE_RESOURCE))) { IMAGE_NT_HEADERS *nt = RtlImageNtHeader( (HMODULE)((ULONG_PTR)module & ~3) ); - if (nt->FileHeader.Machine == ALT_MACHINE) reexec_self(); + reexec_self( nt->FileHeader.Machine ); } output_write(STRING_DLL_LOAD_FAILED, strDll); ExitProcess(LOADLIBRARY_FAILED);

1 0

Francois Gouget : winetest: Fix the path to the ntoskrnl.exe/tests source.
by Alexandre Julliard 29 Apr '21

29 Apr '21

Module: wine Branch: master Commit: f932fb327ae1459dac54a488bc4a0a5dbdd49cd4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f932fb327ae1459dac54a488… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Apr 29 15:14:40 2021 +0200 winetest: Fix the path to the ntoskrnl.exe/tests source. It's the only test with a .exe extension for which the source is not in programs! Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winetest/main.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/programs/winetest/main.c b/programs/winetest/main.c index cb2f23a161e..a05c8f9939b 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -518,7 +518,8 @@ static const char* get_test_source_file(const char* test, const char* subtest) static char buffer[MAX_PATH]; int len = strlen(test); - if (len > 4 && !strcmp( test + len - 4, ".exe" )) + if (len > 4 && !strcmp( test + len - 4, ".exe" ) && + strcmp( test, "ntoskrnl.exe" )) /* the one exception! */ { len = sprintf(buffer, "programs/%s", test) - 4; buffer[len] = 0;

1 0

Rémi Bernon : ntdll/tests: Remove Qpc(Interrupt|System)TimeIncrement(Shift) checks.
by Alexandre Julliard 29 Apr '21

29 Apr '21

Module: wine Branch: master Commit: 24d2a659167d2d95ec68708dbbea30d2624cf548 URL: https://source.winehq.org/git/wine.git/?a=commit;h=24d2a659167d2d95ec68708d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Apr 29 11:03:06 2021 +0200 ntdll/tests: Remove Qpc(Interrupt|System)TimeIncrement(Shift) checks. They are not fixed and are updated from time to time (every few secs), randomly failing the tests on the testbot. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/time.c | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/dlls/ntdll/tests/time.c b/dlls/ntdll/tests/time.c index 2ed28a35d8e..90737521a4d 100644 --- a/dlls/ntdll/tests/time.c +++ b/dlls/ntdll/tests/time.c @@ -172,14 +172,6 @@ static void test_RtlQueryPerformanceCounter(void) "unexpected QpcBypassEnabled %x, expected 0x83\n", usd->u3.s.QpcBypassEnabled ); ok( usd->QpcFrequency == 10000000, "unexpected QpcFrequency %I64d, expected 10000000\n", usd->QpcFrequency ); ok( !usd->u3.s.QpcShift, "unexpected QpcShift %d, expected 0\n", usd->u3.s.QpcShift ); - ok( usd->QpcInterruptTimeIncrement == ((ULONGLONG)1 << 63), - "unexpected QpcInterruptTimeIncrement %I64x, expected 1<<63\n", usd->QpcInterruptTimeIncrement ); - ok( usd->QpcInterruptTimeIncrementShift == 1, - "unexpected QpcInterruptTimeIncrementShift %d, expected 1\n", usd->QpcInterruptTimeIncrementShift ); - ok( usd->QpcSystemTimeIncrement == ((ULONGLONG)1 << 63), - "unexpected QpcSystemTimeIncrement %I64x, expected 1<<63\n", usd->QpcSystemTimeIncrement ); - ok( usd->QpcSystemTimeIncrementShift == 1, - "unexpected QpcSystemTimeIncrementShift %d, expected 1\n", usd->QpcSystemTimeIncrementShift ); hsd = NULL; status = pNtQuerySystemInformation( SystemHypervisorSharedPageInformation, &hsd, sizeof(void *), &len ); @@ -201,10 +193,6 @@ static void test_RtlQueryPerformanceCounter(void) else { ok( usd->u3.s.QpcShift == 10, "unexpected QpcShift %d, expected 10\n", usd->u3.s.QpcShift ); - ok( usd->QpcInterruptTimeIncrementShift == 2, - "unexpected QpcInterruptTimeIncrementShift %d, expected 2\n", usd->QpcInterruptTimeIncrementShift ); - ok( usd->QpcSystemTimeIncrementShift == 2, - "unexpected QpcSystemTimeIncrementShift %d, expected 2\n", usd->QpcSystemTimeIncrementShift ); tsc0 = __rdtsc(); ret = pRtlQueryPerformanceCounter( &counter );

1 0

Hans Leidekker : msv1_0: New dll.
by Alexandre Julliard 29 Apr '21

29 Apr '21

Module: wine Branch: master Commit: 5070d6acd2ac45c6a717723b491eb08deedb2be7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5070d6acd2ac45c6a717723b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Apr 29 12:47:29 2021 +0200 msv1_0: New dll. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/msv1_0/Makefile.in | 3 +++ dlls/msv1_0/msv1_0.spec | 19 +++++++++++++++++++ 4 files changed, 25 insertions(+) diff --git a/configure b/configure index 14e4bc87ce9..a3d73d0551e 100755 --- a/configure +++ b/configure @@ -1471,6 +1471,7 @@ enable_msscript_ocx enable_mssign32 enable_mssip32 enable_mstask +enable_msv1_0 enable_msvcirt enable_msvcm80 enable_msvcm90 @@ -20820,6 +20821,7 @@ wine_fn_config_makefile dlls/mssign32 enable_mssign32 wine_fn_config_makefile dlls/mssip32 enable_mssip32 wine_fn_config_makefile dlls/mstask enable_mstask wine_fn_config_makefile dlls/mstask/tests enable_tests +wine_fn_config_makefile dlls/msv1_0 enable_msv1_0 wine_fn_config_makefile dlls/msvcirt enable_msvcirt wine_fn_config_makefile dlls/msvcirt/tests enable_tests wine_fn_config_makefile dlls/msvcm80 enable_msvcm80 diff --git a/configure.ac b/configure.ac index daa7203748c..678d3c8344a 100644 --- a/configure.ac +++ b/configure.ac @@ -3485,6 +3485,7 @@ WINE_CONFIG_MAKEFILE(dlls/mssign32) WINE_CONFIG_MAKEFILE(dlls/mssip32) WINE_CONFIG_MAKEFILE(dlls/mstask) WINE_CONFIG_MAKEFILE(dlls/mstask/tests) +WINE_CONFIG_MAKEFILE(dlls/msv1_0) WINE_CONFIG_MAKEFILE(dlls/msvcirt) WINE_CONFIG_MAKEFILE(dlls/msvcirt/tests) WINE_CONFIG_MAKEFILE(dlls/msvcm80) diff --git a/dlls/msv1_0/Makefile.in b/dlls/msv1_0/Makefile.in new file mode 100644 index 00000000000..ceac399a207 --- /dev/null +++ b/dlls/msv1_0/Makefile.in @@ -0,0 +1,3 @@ +MODULE = msv1_0.dll + +EXTRADLLFLAGS = -mno-cygwin diff --git a/dlls/msv1_0/msv1_0.spec b/dlls/msv1_0/msv1_0.spec new file mode 100644 index 00000000000..cb544188b87 --- /dev/null +++ b/dlls/msv1_0/msv1_0.spec @@ -0,0 +1,19 @@ +@ stub DllMain +@ stub LsaApCallPackage +@ stub LsaApCallPackagePassthrough +@ stub LsaApCallPackageUntrusted +@ stub LsaApInitializePackage +@ stub LsaApLogonTerminated +@ stub LsaApLogonUserEx2 +@ stub Msv1_0ExportSubAuthenticationRoutine +@ stub Msv1_0SubAuthenticationPresent +@ stub MsvGetLogonAttemptCount +@ stub MsvIsIpAddressLocal +@ stub MsvIsLocalhostAliases +@ stub MsvSamLogoff +@ stub MsvSamValidate +@ stub MsvValidateTarget +@ stub SpInitialize +@ stub SpInstanceInit +@ stub SpLsaModeInitialize +@ stub SpUserModeInitialize

1 0

Hans Leidekker : msv1_0: Initial implementation of the LSA and user mode interfaces.
by Alexandre Julliard 29 Apr '21

29 Apr '21

Module: wine Branch: master Commit: 1eefdd6bee17d547a3ac3cf639203021aa16d7e7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1eefdd6bee17d547a3ac3cf6… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Apr 29 12:47:30 2021 +0200 msv1_0: Initial implementation of the LSA and user mode interfaces. Just enough to initialize the provider. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msv1_0/Makefile.in | 3 + dlls/msv1_0/main.c | 188 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/msv1_0/msv1_0.spec | 4 +- 3 files changed, 193 insertions(+), 2 deletions(-) diff --git a/dlls/msv1_0/Makefile.in b/dlls/msv1_0/Makefile.in index ceac399a207..155ce593ab1 100644 --- a/dlls/msv1_0/Makefile.in +++ b/dlls/msv1_0/Makefile.in @@ -1,3 +1,6 @@ MODULE = msv1_0.dll EXTRADLLFLAGS = -mno-cygwin + +C_SRCS = \ + main.c diff --git a/dlls/msv1_0/main.c b/dlls/msv1_0/main.c new file mode 100644 index 00000000000..d3480c563f0 --- /dev/null +++ b/dlls/msv1_0/main.c @@ -0,0 +1,188 @@ +/* + * Copyright 2005, 2006 Kai Blin + * Copyright 2021 Hans Leidekker for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include "windef.h" +#include "winbase.h" +#include "winternl.h" +#include "sspi.h" +#include "ntsecapi.h" +#include "ntsecpkg.h" +#include "rpc.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(ntlm); + +static ULONG ntlm_package_id; +static LSA_DISPATCH_TABLE lsa_dispatch; + +#define NTLM_CAPS \ + ( SECPKG_FLAG_INTEGRITY \ + | SECPKG_FLAG_PRIVACY \ + | SECPKG_FLAG_TOKEN_ONLY \ + | SECPKG_FLAG_CONNECTION \ + | SECPKG_FLAG_MULTI_REQUIRED \ + | SECPKG_FLAG_IMPERSONATION \ + | SECPKG_FLAG_ACCEPT_WIN32_NAME \ + | SECPKG_FLAG_NEGOTIABLE \ + | SECPKG_FLAG_LOGON \ + | SECPKG_FLAG_RESTRICTED_TOKENS ) + +#define NTLM_MAX_BUF 1904 + +static const SecPkgInfoW ntlm_package_info = +{ + NTLM_CAPS, + 1, + RPC_C_AUTHN_WINNT, + NTLM_MAX_BUF, + (SEC_WCHAR *)L"NTLM", + (SEC_WCHAR *)L"NTLM Security Package" +}; + +static inline const char *debugstr_as( const STRING *str ) +{ + if (!str) return "<null>"; + return debugstr_an( str->Buffer, str->Length ); +} + +static NTSTATUS NTAPI ntlm_LsaApInitializePackage( ULONG package_id, LSA_DISPATCH_TABLE *dispatch, + LSA_STRING *database, LSA_STRING *confidentiality, + LSA_STRING **package_name ) +{ + LSA_STRING *str; + char *ptr; + + TRACE( "%08x, %p, %s, %s, %p\n", package_id, dispatch, debugstr_as(database), debugstr_as(confidentiality), + package_name ); + + if (!(str = dispatch->AllocateLsaHeap( sizeof(*str) + sizeof("NTLM" )))) return STATUS_NO_MEMORY; + ptr = (char *)(str + 1); + memcpy( ptr, "NTLM", sizeof("NTLM") ); + RtlInitString( str, ptr ); + + ntlm_package_id = package_id; + lsa_dispatch = *dispatch; + + *package_name = str; + return STATUS_SUCCESS; +} + +static NTSTATUS NTAPI ntlm_SpInitialize( ULONG_PTR package_id, SECPKG_PARAMETERS *params, + LSA_SECPKG_FUNCTION_TABLE *lsa_function_table ) +{ + FIXME( "%lu, %p, %p\n", package_id, params, lsa_function_table ); + return STATUS_SUCCESS; +} + +static NTSTATUS NTAPI ntlm_SpGetInfo( SecPkgInfoW *info ) +{ + TRACE( "%p\n", info ); + *info = ntlm_package_info; + return STATUS_SUCCESS; +} + +static SECPKG_FUNCTION_TABLE ntlm_table = +{ + ntlm_LsaApInitializePackage, + NULL, /* LsaLogonUser */ + NULL, /* CallPackage */ + NULL, /* LogonTerminated */ + NULL, /* CallPackageUntrusted */ + NULL, /* CallPackagePassthrough */ + NULL, /* LogonUserEx */ + NULL, /* LogonUserEx2 */ + ntlm_SpInitialize, + NULL, /* SpShutdown */ + ntlm_SpGetInfo, + NULL, /* AcceptCredentials */ + NULL, /* SpAcquireCredentialsHandle */ + NULL, /* SpQueryCredentialsAttributes */ + NULL, /* SpFreeCredentialsHandle */ + NULL, /* SaveCredentials */ + NULL, /* GetCredentials */ + NULL, /* DeleteCredentials */ + NULL, /* SpInitLsaModeContext */ + NULL, /* SpAcceptLsaModeContext */ + NULL, /* SpDeleteContext */ + NULL, /* ApplyControlToken */ + NULL, /* GetUserInfo */ + NULL, /* GetExtendedInformation */ + NULL, /* SpQueryContextAttributes */ + NULL, /* SpAddCredentials */ + NULL, /* SetExtendedInformation */ + NULL, /* SetContextAttributes */ + NULL, /* SetCredentialsAttributes */ + NULL, /* ChangeAccountPassword */ + NULL, /* QueryMetaData */ + NULL, /* ExchangeMetaData */ + NULL, /* GetCredUIContext */ + NULL, /* UpdateCredentials */ + NULL, /* ValidateTargetInfo */ + NULL, /* PostLogonUser */ +}; + +NTSTATUS NTAPI SpLsaModeInitialize( ULONG lsa_version, ULONG *package_version, SECPKG_FUNCTION_TABLE **table, + ULONG *table_count ) +{ + TRACE( "%08x, %p, %p, %p\n", lsa_version, package_version, table, table_count ); + + *package_version = SECPKG_INTERFACE_VERSION; + *table = &ntlm_table; + *table_count = 1; + return STATUS_SUCCESS; +} + +static NTSTATUS NTAPI ntlm_SpInstanceInit( ULONG version, SECPKG_DLL_FUNCTIONS *dll_functions, void **user_functions ) +{ + TRACE( "%08x, %p, %p\n", version, dll_functions, user_functions ); + return STATUS_SUCCESS; +} + +static SECPKG_USER_FUNCTION_TABLE ntlm_user_table = +{ + ntlm_SpInstanceInit, + NULL, /* SpInitUserModeContext */ + NULL, /* SpMakeSignature */ + NULL, /* SpVerifySignature */ + NULL, /* SpSealMessage */ + NULL, /* SpUnsealMessage */ + NULL, /* SpGetContextToken */ + NULL, /* SpQueryContextAttributes */ + NULL, /* SpCompleteAuthToken */ + NULL, /* SpDeleteContext */ + NULL, /* SpFormatCredentialsFn */ + NULL, /* SpMarshallSupplementalCreds */ + NULL, /* SpExportSecurityContext */ + NULL /* SpImportSecurityContext */ +}; + +NTSTATUS NTAPI SpUserModeInitialize( ULONG lsa_version, ULONG *package_version, SECPKG_USER_FUNCTION_TABLE **table, + ULONG *table_count ) +{ + TRACE( "%08x, %p, %p, %p\n", lsa_version, package_version, table, table_count ); + + *package_version = SECPKG_INTERFACE_VERSION; + *table = &ntlm_user_table; + *table_count = 1; + return STATUS_SUCCESS; +} diff --git a/dlls/msv1_0/msv1_0.spec b/dlls/msv1_0/msv1_0.spec index cb544188b87..f751ed40521 100644 --- a/dlls/msv1_0/msv1_0.spec +++ b/dlls/msv1_0/msv1_0.spec @@ -15,5 +15,5 @@ @ stub MsvValidateTarget @ stub SpInitialize @ stub SpInstanceInit -@ stub SpLsaModeInitialize -@ stub SpUserModeInitialize +@ stdcall SpLsaModeInitialize(long ptr ptr ptr) +@ stdcall SpUserModeInitialize(long ptr ptr ptr)

1 0