wine-commits April 2021

wine-commits@winehq.org

2 participants
865 discussions

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 jn implementation from musl.
by Alexandre Julliard 29 Apr '21

29 Apr '21

Module: wine Branch: master Commit: 0a105999a2807d2649800399d2551dd976b24279 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0a105999a2807d2649800399… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 29 17:06:22 2021 +0200 msvcrt: Import jn 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 | 128 ++++++++++++++++++++++++++++++++++++++++++++++++-- dlls/msvcrt/unixlib.c | 14 ------ dlls/msvcrt/unixlib.h | 1 - include/config.h.in | 3 -- 6 files changed, 125 insertions(+), 23 deletions(-) diff --git a/configure b/configure index 3c12aa85227..33e79ad04a4 100755 --- a/configure +++ b/configure @@ -19631,7 +19631,6 @@ for ac_func in \ expm1f \ fma \ fmaf \ - jn \ lgamma \ lgammaf \ llrint \ diff --git a/configure.ac b/configure.ac index 65661d89263..550da301100 100644 --- a/configure.ac +++ b/configure.ac @@ -2674,7 +2674,6 @@ AC_CHECK_FUNCS(\ expm1f \ fma \ fmaf \ - jn \ lgamma \ lgammaf \ llrint \ diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index aa5f4b1af7b..019fb836c07 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -2912,11 +2912,133 @@ double CDECL _j1(double x) /********************************************************************* * _jn (MSVCRT.@) + * + * Copied from musl: src/math/jn.c */ -double CDECL _jn(int n, double num) +double CDECL _jn(int n, double x) { - /* FIXME: errno handling */ - return unix_funcs->jn( n, num ); + static const double invsqrtpi = 5.64189583547756279280e-01; + + unsigned int ix, lx; + int nm1, i, sign; + 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 (n == 0) + return _j0(x); + if (n < 0) { + nm1 = -(n + 1); + x = -x; + sign ^= 1; + } else { + nm1 = n-1; + } + if (nm1 == 0) + return j1(x); + + sign &= n; /* even n: 0, odd n: signbit(x) */ + x = fabs(x); + if ((ix | lx) == 0 || ix == 0x7ff00000) /* if x is 0 or inf */ + b = 0.0; + else if (nm1 < x) { + if (ix >= 0x52d00000) { /* x > 2**302 */ + switch(nm1 & 3) { + case 0: + temp = -cos(x) + sin(x); + break; + case 1: + temp = -cos(x) - sin(x); + break; + case 2: + temp = cos(x) - sin(x); + break; + default: + temp = cos(x) + sin(x); + break; + } + b = invsqrtpi * temp / sqrt(x); + } else { + a = _j0(x); + b = _j1(x); + for (i = 0; i < nm1; ) { + i++; + temp = b; + b = b * (2.0 * i / x) - a; /* avoid underflow */ + a = temp; + } + } + } else { + if (ix < 0x3e100000) { /* x < 2**-29 */ + if (nm1 > 32) /* underflow */ + b = 0.0; + else { + temp = x * 0.5; + b = temp; + a = 1.0; + for (i = 2; i <= nm1 + 1; i++) { + a *= (double)i; /* a = n! */ + b *= temp; /* b = (x/2)^n */ + } + b = b / a; + } + } else { + double t, q0, q1, w, h, z, tmp, nf; + int k; + + nf = nm1 + 1.0; + w = 2 * nf / x; + h = 2 / x; + z = w + h; + q0 = w; + q1 = w * z - 1.0; + k = 1; + while (q1 < 1.0e9) { + k += 1; + z += h; + tmp = z * q1 - q0; + q0 = q1; + q1 = tmp; + } + for (t = 0.0, i = k; i >= 0; i--) + t = 1 / (2 * (i + nf) / x - t); + a = t; + b = 1.0; + tmp = nf * log(fabs(w)); + if (tmp < 7.09782712893383973096e+02) { + for (i = nm1; i > 0; i--) { + temp = b; + b = b * (2.0 * i) / x - a; + a = temp; + } + } else { + for (i = nm1; i > 0; i--) { + temp = b; + b = b * (2.0 * i) / x - a; + a = temp; + /* scale b to avoid spurious overflow */ + if (b > 0x1p500) { + a /= b; + t /= b; + b = 1.0; + } + } + } + z = j0(x); + w = j1(x); + if (fabs(z) >= fabs(w)) + b = t * z / b; + else + b = t * w / a; + } + } + return sign ? -b : b; } /********************************************************************* diff --git a/dlls/msvcrt/unixlib.c b/dlls/msvcrt/unixlib.c index 597d0ed7f64..c5e62613940 100644 --- a/dlls/msvcrt/unixlib.c +++ b/dlls/msvcrt/unixlib.c @@ -401,19 +401,6 @@ static float CDECL unix_hypotf(float x, float y) return hypotf( x, y ); } -/********************************************************************* - * jn - */ -static double CDECL unix_jn(int n, double num) -{ -#ifdef HAVE_JN - return jn(n, num); -#else - FIXME("not implemented\n"); - return 0; -#endif -} - /********************************************************************* * ldexp */ @@ -1001,7 +988,6 @@ static const struct unix_funcs funcs = unix_frexpf, unix_hypot, unix_hypotf, - unix_jn, unix_ldexp, unix_lgamma, unix_lgammaf, diff --git a/dlls/msvcrt/unixlib.h b/dlls/msvcrt/unixlib.h index 21caa036498..48fc075d530 100644 --- a/dlls/msvcrt/unixlib.h +++ b/dlls/msvcrt/unixlib.h @@ -57,7 +57,6 @@ struct unix_funcs float (CDECL *frexpf)(float x, int *exp); double (CDECL *hypot)(double x, double y); float (CDECL *hypotf)(float x, float y); - double (CDECL *jn)(int n, double num); double (CDECL *ldexp)(double x, int exp); double (CDECL *lgamma)(double x); float (CDECL *lgammaf)(float x); diff --git a/include/config.h.in b/include/config.h.in index 266d8cec8d9..197d5c4b5f7 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -288,9 +288,6 @@ /* Define to 1 if you have the `isnan' function. */ #undef HAVE_ISNAN -/* Define to 1 if you have the `jn' function. */ -#undef HAVE_JN - /* Define to 1 if you have the <jpeglib.h> header file. */ #undef HAVE_JPEGLIB_H

1 0

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

29 Apr '21

Module: wine Branch: master Commit: e10bd6f46f6ae174cfe9ea4550dc367877f1581e URL: https://source.winehq.org/git/wine.git/?a=commit;h=e10bd6f46f6ae174cfe9ea45… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 29 17:06:19 2021 +0200 msvcrt: Import y1 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 | 46 ++++++++++++++++++++++++++++++++++++---------- dlls/msvcrt/unixlib.c | 14 -------------- dlls/msvcrt/unixlib.h | 1 - include/config.h.in | 3 --- 6 files changed, 36 insertions(+), 30 deletions(-) diff --git a/configure b/configure index cdc0342b066..3c12aa85227 100755 --- a/configure +++ b/configure @@ -19662,7 +19662,6 @@ for ac_func in \ tgammaf \ trunc \ truncf \ - y1 \ yn do : diff --git a/configure.ac b/configure.ac index 03915d384f2..65661d89263 100644 --- a/configure.ac +++ b/configure.ac @@ -2705,7 +2705,6 @@ AC_CHECK_FUNCS(\ tgammaf \ trunc \ truncf \ - y1 \ yn ) LIBS="$ac_save_LIBS" diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 0ebe7b91cb7..aa5f4b1af7b 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -2971,18 +2971,44 @@ double CDECL _y0(double x) /********************************************************************* * _y1 (MSVCRT.@) */ -double CDECL _y1(double num) +double CDECL _y1(double x) { - double retval; + static const double tpi = 6.36619772367581382433e-01, + u00 = -1.96057090646238940668e-01, + u01 = 5.04438716639811282616e-02, + u02 = -1.91256895875763547298e-03, + u03 = 2.35252600561610495928e-05, + u04 = -9.19099158039878874504e-08, + v00 = 1.99167318236649903973e-02, + v01 = 2.02552581025135171496e-04, + v02 = 1.35608801097516229404e-06, + v03 = 6.22741452364621501295e-09, + v04 = 1.66559246207992079114e-11; - if (!isfinite(num)) *_errno() = EDOM; - retval = unix_funcs->y1( num ); - if (_fpclass(retval) == _FPCLASS_NINF) - { - *_errno() = EDOM; - retval = NAN; - } - return retval; + double z, u, v; + unsigned int ix, lx; + + ix = *(ULONGLONG*)&x >> 32; + lx = *(ULONGLONG*)&x; + + /* y1(nan)=nan, y1(<0)=nan, y1(0)=-inf, y1(inf)=0 */ + if ((ix << 1 | lx) == 0) + return math_error(_OVERFLOW, "_y1", x, 0, -INFINITY); + if (isnan(x)) + return x; + if (ix >> 31) + return math_error(_DOMAIN, "_y1", x, 0, 0 / (x - x)); + if (ix >= 0x7ff00000) + return 1 / x; + + if (ix >= 0x40000000) /* x >= 2 */ + return j1_y1_approx(ix, x, TRUE, 0); + if (ix < 0x3c900000) /* x < 2**-54 */ + return -tpi / x; + z = x * x; + u = u00 + z * (u01 + z * (u02 + z * (u03 + z * u04))); + v = 1 + z * (v00 + z * (v01 + z * (v02 + z * (v03 + z * v04)))); + return x * (u / v) + tpi * (j1(x) * log(x) - 1 / x); } /********************************************************************* diff --git a/dlls/msvcrt/unixlib.c b/dlls/msvcrt/unixlib.c index 6b33eed223a..597d0ed7f64 100644 --- a/dlls/msvcrt/unixlib.c +++ b/dlls/msvcrt/unixlib.c @@ -952,19 +952,6 @@ static float CDECL unix_tgammaf(float x) #endif } -/********************************************************************* - * y1 - */ -static double CDECL unix_y1(double num) -{ -#ifdef HAVE_Y1 - return y1(num); -#else - FIXME("not implemented\n"); - return 0; -#endif -} - /********************************************************************* * yn */ @@ -1066,7 +1053,6 @@ static const struct unix_funcs funcs = unix_tgammaf, unix_trunc, unix_truncf, - unix_y1, unix_yn }; diff --git a/dlls/msvcrt/unixlib.h b/dlls/msvcrt/unixlib.h index d7b1827e08e..21caa036498 100644 --- a/dlls/msvcrt/unixlib.h +++ b/dlls/msvcrt/unixlib.h @@ -109,7 +109,6 @@ struct unix_funcs float (CDECL *tgammaf)(float x); double (CDECL *trunc)(double x); float (CDECL *truncf)(float x); - double (CDECL *y1)(double num); double (CDECL *yn)(int order, double num); }; diff --git a/include/config.h.in b/include/config.h.in index 8985cf6b474..266d8cec8d9 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -1169,9 +1169,6 @@ /* Define if Xrandr has the XRRGetProviderResources function */ #undef HAVE_XRRGETPROVIDERRESOURCES -/* Define to 1 if you have the `y1' function. */ -#undef HAVE_Y1 - /* Define to 1 if you have the `yn' function. */ #undef HAVE_YN

1 0

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

29 Apr '21

Module: wine Branch: master Commit: 3911ac3f45b8b1372f8677c8ee69c16d9848cd02 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3911ac3f45b8b1372f8677c8… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 29 17:06:15 2021 +0200 msvcrt: Import j1 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 | 232 +++++++++++++++++++++++++++++++++++++++++++++++++- dlls/msvcrt/unixlib.c | 14 --- dlls/msvcrt/unixlib.h | 1 - include/config.h.in | 3 - 6 files changed, 229 insertions(+), 23 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3911ac3f45b8b1372f86…

1 0

Hugh McMaster : reg: Use correct error message if RegCreateKeyExW() fails.
by Alexandre Julliard 29 Apr '21

29 Apr '21

1 0

Jacek Caban : winevulkan: Use wine_ prefix for Unix thunks.
by Alexandre Julliard 29 Apr '21

29 Apr '21

Module: wine Branch: master Commit: 0fce8076f2d4bb9b484218d94dc17209879d5caa URL: https://source.winehq.org/git/wine.git/?a=commit;h=0fce8076f2d4bb9b484218d9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 29 14:38:50 2021 +0200 winevulkan: Use wine_ prefix for Unix thunks. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vulkan-1/vulkan-1.spec | 392 +++++----- dlls/winevulkan/loader_thunks.c | 1554 +++++++++++++++++++-------------------- dlls/winevulkan/loader_thunks.h | 10 - dlls/winevulkan/make_vulkan | 4 +- dlls/winevulkan/vulkan.c | 98 +-- dlls/winevulkan/vulkan_thunks.c | 1474 ++++++++++++++++++------------------- dlls/winevulkan/vulkan_thunks.h | 100 +-- dlls/winevulkan/winevulkan.spec | 398 +++++----- 8 files changed, 2010 insertions(+), 2020 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0fce8076f2d4bb9b4842…

1 0

Jacek Caban : winevulkan: Don't use wine_ prefix on PE side.
by Alexandre Julliard 29 Apr '21

29 Apr '21

Module: wine Branch: master Commit: 007a4bc9b0f788f91125b692ea12ce23adf1eb21 URL: https://source.winehq.org/git/wine.git/?a=commit;h=007a4bc9b0f788f91125b692… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 29 14:38:46 2021 +0200 winevulkan: Don't use wine_ prefix on PE side. There is no ABI ambiguity, so we may just use public names. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/loader.c | 34 +++++++++++++++++----------------- dlls/winevulkan/make_vulkan | 37 +++++++++++++------------------------ dlls/winevulkan/vulkan_loader.h | 2 -- dlls/winevulkan/vulkan_private.h | 1 + 4 files changed, 31 insertions(+), 43 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=007a4bc9b0f788f91125…

1 0

Hans Leidekker : msv1_0: Implement SpInitLsaModeContext and SpDeleteContext.
by Alexandre Julliard 29 Apr '21

29 Apr '21

Module: wine Branch: master Commit: 368d9cb591f238714e66fa372d68e9b8824b16b8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=368d9cb591f238714e66fa37… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Apr 29 12:47:33 2021 +0200 msv1_0: Implement SpInitLsaModeContext and SpDeleteContext. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msv1_0/Makefile.in | 1 + dlls/msv1_0/main.c | 561 +++++++++++++++++++++++++++++++++++++++++++++++- dlls/msv1_0/unixlib.c | 68 ++++++ dlls/msv1_0/unixlib.h | 1 + 4 files changed, 629 insertions(+), 2 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=368d9cb591f238714e66…

1 0

Hans Leidekker : msv1_0: Implement SpAcquireCredentialsHandle and SpFreeCredentialsHandle.
by Alexandre Julliard 29 Apr '21

29 Apr '21

Module: wine Branch: master Commit: e73932e08d0d587329ec15abca9a3d6f89070200 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e73932e08d0d587329ec15ab… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Apr 29 12:47:32 2021 +0200 msv1_0: Implement SpAcquireCredentialsHandle and SpFreeCredentialsHandle. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msv1_0/main.c | 170 ++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 168 insertions(+), 2 deletions(-) diff --git a/dlls/msv1_0/main.c b/dlls/msv1_0/main.c index 1b143ebf3bd..7dabd8e2ff5 100644 --- a/dlls/msv1_0/main.c +++ b/dlls/msv1_0/main.c @@ -18,6 +18,7 @@ */ #include <stdarg.h> +#include <stdlib.h> #include "ntstatus.h" #define WIN32_NO_STATUS #include "windef.h" @@ -29,6 +30,7 @@ #include "rpc.h" #include "wine/debug.h" +#include "unixlib.h" WINE_DEFAULT_DEBUG_CHANNEL(ntlm); @@ -68,6 +70,12 @@ static inline const char *debugstr_as( const STRING *str ) return debugstr_an( str->Buffer, str->Length ); } +static inline const char *debugstr_us( const UNICODE_STRING *str ) +{ + if (!str) return "<null>"; + return debugstr_wn( str->Buffer, str->Length / sizeof(WCHAR) ); +} + static NTSTATUS NTAPI ntlm_LsaApInitializePackage( ULONG package_id, LSA_DISPATCH_TABLE *dispatch, LSA_STRING *database, LSA_STRING *confidentiality, LSA_STRING **package_name ) @@ -116,6 +124,164 @@ static NTSTATUS NTAPI ntlm_SpGetInfo( SecPkgInfoW *info ) return STATUS_SUCCESS; } +static char *get_username_arg( const WCHAR *user, int user_len ) +{ + static const char arg[] = "--username="; + int len = sizeof(arg); + char *ret; + + len += WideCharToMultiByte( CP_UNIXCP, WC_NO_BEST_FIT_CHARS, user, user_len, NULL, 0, NULL, NULL ); + if (!(ret = malloc( len ))) return NULL; + memcpy( ret, arg, sizeof(arg) - 1 ); + WideCharToMultiByte( CP_UNIXCP, WC_NO_BEST_FIT_CHARS, user, user_len, ret + sizeof(arg) - 1, + len - sizeof(arg) + 1, NULL, NULL ); + ret[len - 1] = 0; + return ret; +} + +static char *get_domain_arg( const WCHAR *domain, int domain_len ) +{ + static const char arg[] = "--domain="; + int len = sizeof(arg); + char *ret; + + len += WideCharToMultiByte( CP_UNIXCP, WC_NO_BEST_FIT_CHARS, domain, domain_len, NULL, 0, NULL, NULL ); + if (!(ret = malloc( len ))) return NULL; + memcpy( ret, arg, sizeof(arg) - 1 ); + WideCharToMultiByte( CP_UNIXCP, WC_NO_BEST_FIT_CHARS, domain, domain_len, ret + sizeof(arg) - 1, + len - sizeof(arg) + 1, NULL, NULL ); + ret[len - 1] = 0; + return ret; +} + +static NTSTATUS NTAPI ntlm_SpAcquireCredentialsHandle( UNICODE_STRING *principal, ULONG cred_use, LUID *logon_id, + void *auth_data, void *get_key_fn, void *get_key_arg, + LSA_SEC_HANDLE *handle, TimeStamp *expiry ) +{ + SECURITY_STATUS status = SEC_E_INSUFFICIENT_MEMORY; + struct ntlm_cred *cred = NULL; + WCHAR *domain = NULL, *user = NULL, *password = NULL; + SEC_WINNT_AUTH_IDENTITY_W *id = NULL; + + TRACE( "%s, 0x%08x, %p, %p, %p, %p, %p, %p\n", debugstr_us(principal), cred_use, logon_id, auth_data, + get_key_fn, get_key_arg, cred, expiry ); + + switch (cred_use) + { + case SECPKG_CRED_INBOUND: + if (!(cred = malloc( sizeof(*cred) ))) return SEC_E_INSUFFICIENT_MEMORY; + cred->mode = MODE_SERVER; + cred->username_arg = NULL; + cred->domain_arg = NULL; + cred->password = NULL; + cred->password_len = 0; + cred->no_cached_credentials = 0; + + *handle = (LSA_SEC_HANDLE)cred; + status = SEC_E_OK; + break; + + case SECPKG_CRED_OUTBOUND: + if (!(cred = malloc( sizeof(*cred) ))) return SEC_E_INSUFFICIENT_MEMORY; + + cred->mode = MODE_CLIENT; + cred->username_arg = NULL; + cred->domain_arg = NULL; + cred->password = NULL; + cred->password_len = 0; + cred->no_cached_credentials = 0; + + if ((id = auth_data)) + { + int domain_len = 0, user_len = 0, password_len = 0; + if (id->Flags & SEC_WINNT_AUTH_IDENTITY_ANSI) + { + if (id->DomainLength) + { + domain_len = MultiByteToWideChar( CP_ACP, 0, (char *)id->Domain, id->DomainLength, NULL, 0 ); + if (!(domain = malloc( sizeof(WCHAR) * domain_len ))) goto done; + MultiByteToWideChar( CP_ACP, 0, (char *)id->Domain, id->DomainLength, domain, domain_len ); + } + if (id->UserLength) + { + user_len = MultiByteToWideChar( CP_ACP, 0, (char *)id->User, id->UserLength, NULL, 0 ); + if (!(user = malloc( sizeof(WCHAR) * user_len ))) goto done; + MultiByteToWideChar( CP_ACP, 0, (char *)id->User, id->UserLength, user, user_len ); + } + if (id->PasswordLength) + { + password_len = MultiByteToWideChar( CP_ACP, 0,(char *)id->Password, id->PasswordLength, NULL, 0 ); + if (!(password = malloc( sizeof(WCHAR) * password_len ))) goto done; + MultiByteToWideChar( CP_ACP, 0, (char *)id->Password, id->PasswordLength, password, password_len ); + } + } + else + { + domain = id->Domain; + domain_len = id->DomainLength; + user = id->User; + user_len = id->UserLength; + password = id->Password; + password_len = id->PasswordLength; + } + + TRACE( "username is %s\n", debugstr_wn(user, user_len) ); + TRACE( "domain name is %s\n", debugstr_wn(domain, domain_len) ); + + cred->username_arg = get_username_arg( user, user_len ); + cred->domain_arg = get_domain_arg( domain, domain_len ); + if (password_len) + { + cred->password_len = WideCharToMultiByte( CP_UNIXCP, WC_NO_BEST_FIT_CHARS, password, password_len, + NULL, 0, NULL, NULL ); + if (!(cred->password = malloc( cred->password_len ))) goto done; + WideCharToMultiByte( CP_UNIXCP, WC_NO_BEST_FIT_CHARS, password, password_len, cred->password, + cred->password_len, NULL, NULL ); + } + } + + *handle = (LSA_SEC_HANDLE)cred; + status = SEC_E_OK; + break; + + case SECPKG_CRED_BOTH: + FIXME( "SECPKG_CRED_BOTH not supported\n" ); + status = SEC_E_UNSUPPORTED_FUNCTION; + break; + + default: + status = SEC_E_UNKNOWN_CREDENTIALS; + break; + } + +done: + if (id && (id->Flags & SEC_WINNT_AUTH_IDENTITY_ANSI)) + { + free( domain ); + free( user ); + free( password ); + } + if (status != SEC_E_OK) free( cred ); + return status; +} + +static NTSTATUS NTAPI ntlm_SpFreeCredentialsHandle( LSA_SEC_HANDLE handle ) +{ + struct ntlm_cred *cred = (struct ntlm_cred *)handle; + + TRACE( "%lx\n", handle ); + + if (!cred) return SEC_E_OK; + + cred->mode = MODE_INVALID; + if (cred->password) memset( cred->password, 0, cred->password_len ); + free( cred->password ); + free( cred->username_arg ); + free( cred->domain_arg ); + free( cred ); + return SEC_E_OK; +} + static SECPKG_FUNCTION_TABLE ntlm_table = { ntlm_LsaApInitializePackage, @@ -130,9 +296,9 @@ static SECPKG_FUNCTION_TABLE ntlm_table = NULL, /* SpShutdown */ ntlm_SpGetInfo, NULL, /* AcceptCredentials */ - NULL, /* SpAcquireCredentialsHandle */ + ntlm_SpAcquireCredentialsHandle, NULL, /* SpQueryCredentialsAttributes */ - NULL, /* SpFreeCredentialsHandle */ + ntlm_SpFreeCredentialsHandle, NULL, /* SaveCredentials */ NULL, /* GetCredentials */ NULL, /* DeleteCredentials */

1 0

Hans Leidekker : msv1_0: Add a Unix library to support ntlm_auth.
by Alexandre Julliard 29 Apr '21

29 Apr '21

Module: wine Branch: master Commit: 80d82eec913cd854a36993f150ff5750ecbf2c7d URL: https://source.winehq.org/git/wine.git/?a=commit;h=80d82eec913cd854a36993f1… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Apr 29 12:47:31 2021 +0200 msv1_0: Add a Unix library to support ntlm_auth. 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 | 31 +++++++- dlls/msv1_0/msv1_0.spec | 2 +- dlls/msv1_0/unixlib.c | 185 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/msv1_0/unixlib.h | 97 +++++++++++++++++++++++++ 5 files changed, 315 insertions(+), 3 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=80d82eec913cd854a369…

1 0

← Newer
1
...
4
5
6
7
8
9
10
...
87
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2021