October 2021 - Wine-Commits

Alexandre Julliard : ntdll: Copy tan() implementation from msvcrt.
by Alexandre Julliard Oct. 26, 2021

Oct. 26, 2021

Module: wine Branch: master Commit: 90bd0487862c5c6fae85cb8a7d84b53b59db0098 URL: https://source.winehq.org/git/wine.git/?a=commit;h=90bd0487862c5c6fae85cb8a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 26 10:33:55 2021 +0200 ntdll: Copy tan() implementation from msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/math.c | 86 +++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 84 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/math.c b/dlls/ntdll/math.c index 55d82cc3f8e..58965c7b169 100644 --- a/dlls/ntdll/math.c +++ b/dlls/ntdll/math.c @@ -507,6 +507,65 @@ static double __cos(double x, double y) return w + (((1.0 - w) - hz) + (z * r - x * y)); } +/* Copied from musl: src/math/__tan.c */ +static double __tan(double x, double y, int odd) +{ + static const double T[] = { + 3.33333333333334091986e-01, + 1.33333333333201242699e-01, + 5.39682539762260521377e-02, + 2.18694882948595424599e-02, + 8.86323982359930005737e-03, + 3.59207910759131235356e-03, + 1.45620945432529025516e-03, + 5.88041240820264096874e-04, + 2.46463134818469906812e-04, + 7.81794442939557092300e-05, + 7.14072491382608190305e-05, + -1.85586374855275456654e-05, + 2.59073051863633712884e-05, + }; + static const double pio4 = 7.85398163397448278999e-01; + static const double pio4lo = 3.06161699786838301793e-17; + + double z, r, v, w, s, a, w0, a0; + UINT32 hx; + int big, sign; + + hx = *(ULONGLONG*)&x >> 32; + big = (hx & 0x7fffffff) >= 0x3FE59428; /* |x| >= 0.6744 */ + if (big) { + sign = hx >> 31; + if (sign) { + x = -x; + y = -y; + } + x = (pio4 - x) + (pio4lo - y); + y = 0.0; + } + z = x * x; + w = z * z; + r = T[1] + w * (T[3] + w * (T[5] + w * (T[7] + w * (T[9] + w * T[11])))); + v = z * (T[2] + w * (T[4] + w * (T[6] + w * (T[8] + w * (T[10] + w * T[12]))))); + s = z * x; + r = y + z * (s * (r + v) + y) + s * T[0]; + w = x + r; + if (big) { + s = 1 - 2 * odd; + v = s - 2.0 * (x + (r - w * w / (w + s))); + return sign ? -v : v; + } + if (!odd) + return w; + /* -1.0/(x+r) has up to 2ulp error, so compute it accurately */ + w0 = w; + *(LONGLONG*)&w0 = *(LONGLONG*)&w0 & 0xffffffff00000000ULL; + v = r - (w0 - x); /* w0+v = r+x */ + a0 = a = -1.0 / w; + *(LONGLONG*)&a0 = *(LONGLONG*)&a0 & 0xffffffff00000000ULL; + return a0 + a * (1.0 + a0 * w0 + a0 * v); +} + /********************************************************************* * abs (NTDLL.@) @@ -778,10 +837,33 @@ double CDECL sqrt( double d ) /********************************************************************* * tan (NTDLL.@) + * + * Copied from musl: src/math/tan.c */ -double CDECL tan( double d ) +double CDECL tan( double x ) { - return unix_funcs->tan( d ); + double y[2]; + UINT32 ix; + unsigned n; + + ix = *(ULONGLONG*)&x >> 32; + ix &= 0x7fffffff; + + if (ix <= 0x3fe921fb) { /* |x| ~< pi/4 */ + if (ix < 0x3e400000) { /* |x| < 2**-27 */ + /* raise inexact if x!=0 and underflow if subnormal */ + fp_barrier(ix < 0x00100000 ? x / 0x1p120f : x + 0x1p120f); + return x; + } + return __tan(x, 0.0, 0); + } + + if (isinf(x)) return x - x; + if (ix >= 0x7ff00000) + return x - x; + + n = __rem_pio2(x, y); + return __tan(y[0], y[1], n & 1); } #if (defined(__GNUC__) || defined(__clang__)) && defined(__i386__)

1 0

Alexandre Julliard : ntdll: Copy log() implementation from msvcrt.
by Alexandre Julliard Oct. 26, 2021

Oct. 26, 2021

Module: wine Branch: master Commit: 0c0915e98584d93b22d9d02d3752136a65b6fa9f URL: https://source.winehq.org/git/wine.git/?a=commit;h=0c0915e98584d93b22d9d02d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 26 10:33:58 2021 +0200 ntdll: Copy log() implementation from msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/math.c | 369 +++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 367 insertions(+), 2 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0c0915e98584d93b22d9…

1 0

Alexandre Julliard : ntdll: Copy pow() implementation from msvcrt.
by Alexandre Julliard Oct. 26, 2021

Oct. 26, 2021

Module: wine Branch: master Commit: 140cd3553c136864ea722a15834b37d348945e00 URL: https://source.winehq.org/git/wine.git/?a=commit;h=140cd3553c136864ea722a15… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 26 10:34:02 2021 +0200 ntdll: Copy pow() implementation from msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/math.c | 564 +++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 563 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=140cd3553c136864ea72…

1 0

Alexandre Julliard : ntdll: Copy sqrt() implementation from msvcrt.
by Alexandre Julliard Oct. 26, 2021

Oct. 26, 2021

Module: wine Branch: master Commit: 2e4c090c5ecac67908e3fb3290925503c358c38b URL: https://source.winehq.org/git/wine.git/?a=commit;h=2e4c090c5ecac67908e3fb32… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 26 10:34:06 2021 +0200 ntdll: Copy sqrt() implementation from msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/math.c | 134 +++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 132 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/math.c b/dlls/ntdll/math.c index 3126f1d7b39..e6de9e67c1f 100644 --- a/dlls/ntdll/math.c +++ b/dlls/ntdll/math.c @@ -1047,6 +1047,37 @@ static inline int pow_checkint(UINT64 iy) return 2; } +/* Copied from musl: src/math/__fpclassify.c */ +static short _dclass(double x) +{ + union { double f; UINT64 i; } u = { x }; + int e = u.i >> 52 & 0x7ff; + + if (!e) return u.i << 1 ? FP_SUBNORMAL : FP_ZERO; + if (e == 0x7ff) return (u.i << 12) ? FP_NAN : FP_INFINITE; + return FP_NORMAL; +} + +static BOOL sqrt_validate( double *x, BOOL update_sw ) +{ + short c = _dclass(*x); + + if (c == FP_ZERO) return FALSE; + if (c == FP_NAN) + { + /* set signaling bit */ + *(ULONGLONG*)x |= 0x8000000000000ULL; + return FALSE; + } + if (signbit(*x)) + { + *x = -NAN; + return FALSE; + } + if (c == FP_INFINITE) return FALSE; + return TRUE; +} + /********************************************************************* * abs (NTDLL.@) @@ -1756,10 +1787,109 @@ double CDECL sin( double x ) /********************************************************************* * sqrt (NTDLL.@) + * + * Copied from musl: src/math/sqrt.c */ -double CDECL sqrt( double d ) +double CDECL sqrt( double x ) { - return unix_funcs->sqrt( d ); + static const double tiny = 1.0e-300; + + double z; + int sign = 0x80000000; + int ix0,s0,q,m,t,i; + unsigned int r,t1,s1,ix1,q1; + ULONGLONG ix; + + if (!sqrt_validate(&x, TRUE)) + return x; + + ix = *(ULONGLONG*)&x; + ix0 = ix >> 32; + ix1 = ix; + + /* normalize x */ + m = ix0 >> 20; + if (m == 0) { /* subnormal x */ + while (ix0 == 0) { + m -= 21; + ix0 |= (ix1 >> 11); + ix1 <<= 21; + } + for (i=0; (ix0 & 0x00100000) == 0; i++) + ix0 <<= 1; + m -= i - 1; + ix0 |= ix1 >> (32 - i); + ix1 <<= i; + } + m -= 1023; /* unbias exponent */ + ix0 = (ix0 & 0x000fffff) | 0x00100000; + if (m & 1) { /* odd m, double x to make it even */ + ix0 += ix0 + ((ix1 & sign) >> 31); + ix1 += ix1; + } + m >>= 1; /* m = [m/2] */ + + /* generate sqrt(x) bit by bit */ + ix0 += ix0 + ((ix1 & sign) >> 31); + ix1 += ix1; + q = q1 = s0 = s1 = 0; /* [q,q1] = sqrt(x) */ + r = 0x00200000; /* r = moving bit from right to left */ + + while (r != 0) { + t = s0 + r; + if (t <= ix0) { + s0 = t + r; + ix0 -= t; + q += r; + } + ix0 += ix0 + ((ix1 & sign) >> 31); + ix1 += ix1; + r >>= 1; + } + + r = sign; + while (r != 0) { + t1 = s1 + r; + t = s0; + if (t < ix0 || (t == ix0 && t1 <= ix1)) { + s1 = t1 + r; + if ((t1&sign) == sign && (s1 & sign) == 0) + s0++; + ix0 -= t; + if (ix1 < t1) + ix0--; + ix1 -= t1; + q1 += r; + } + ix0 += ix0 + ((ix1 & sign) >> 31); + ix1 += ix1; + r >>= 1; + } + + /* use floating add to find out rounding direction */ + if ((ix0 | ix1) != 0) { + z = 1.0 - tiny; /* raise inexact flag */ + if (z >= 1.0) { + z = 1.0 + tiny; + if (q1 == (unsigned int)0xffffffff) { + q1 = 0; + q++; + } else if (z > 1.0) { + if (q1 == (unsigned int)0xfffffffe) + q++; + q1 += 2; + } else + q1 += q1 & 1; + } + } + ix0 = (q >> 1) + 0x3fe00000; + ix1 = q1 >> 1; + if (q & 1) + ix1 |= sign; + ix = ix0 + ((unsigned int)m << 20); + ix <<= 32; + ix |= ix1; + return *(double*)&ix; } /*********************************************************************

1 0

Alexandre Julliard : ntdll: Remove math functions from the unixlib interface.
by Alexandre Julliard Oct. 26, 2021

Oct. 26, 2021

Module: wine Branch: master Commit: 1b9ada6cabd04ccb02c4ddcc82a53e62ea477948 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1b9ada6cabd04ccb02c4ddcc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 26 10:34:11 2021 +0200 ntdll: Remove math functions from the unixlib interface. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/Makefile.in | 2 +- dlls/ntdll/unix/loader.c | 24 ------------------------ dlls/ntdll/unixlib.h | 14 +------------- 3 files changed, 2 insertions(+), 38 deletions(-) diff --git a/dlls/ntdll/Makefile.in b/dlls/ntdll/Makefile.in index ba23e397545..c40e7ba8242 100644 --- a/dlls/ntdll/Makefile.in +++ b/dlls/ntdll/Makefile.in @@ -4,7 +4,7 @@ UNIXLIB = ntdll.so IMPORTLIB = ntdll IMPORTS = winecrt0 EXTRAINCL = $(UNWIND_CFLAGS) -EXTRALIBS = $(IOKIT_LIBS) $(COREFOUNDATION_LIBS) $(CORESERVICES_LIBS) $(RT_LIBS) $(PTHREAD_LIBS) $(UNWIND_LIBS) $(I386_LIBS) $(PROCSTAT_LIBS) -lm +EXTRALIBS = $(IOKIT_LIBS) $(COREFOUNDATION_LIBS) $(CORESERVICES_LIBS) $(RT_LIBS) $(PTHREAD_LIBS) $(UNWIND_LIBS) $(I386_LIBS) $(PROCSTAT_LIBS) EXTRADLLFLAGS = -nodefaultlibs -Wl,--image-base,0x7bc00000 diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 0542d2bc865..ea7f18602da 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -30,7 +30,6 @@ #include <stdarg.h> #include <stdio.h> #include <signal.h> -#include <math.h> #include <string.h> #include <stdlib.h> #include <sys/types.h> @@ -2137,19 +2136,6 @@ static ULONG_PTR get_image_address(void) } -/* math function wrappers */ -static double CDECL ntdll_atan( double d ) { return atan( d ); } -static double CDECL ntdll_ceil( double d ) { return ceil( d ); } -static double CDECL ntdll_cos( double d ) { return cos( d ); } -static double CDECL ntdll_fabs( double d ) { return fabs( d ); } -static double CDECL ntdll_floor( double d ) { return floor( d ); } -static double CDECL ntdll_log( double d ) { return log( d ); } -static double CDECL ntdll_pow( double x, double y ) { return pow( x, y ); } -static double CDECL ntdll_sin( double d ) { return sin( d ); } -static double CDECL ntdll_sqrt( double d ) { return sqrt( d ); } -static double CDECL ntdll_tan( double d ) { return tan( d ); } - - /*********************************************************************** * unix_funcs */ @@ -2174,16 +2160,6 @@ static struct unix_funcs unix_funcs = fast_RtlReleaseSRWLockShared, fast_RtlWakeConditionVariable, fast_wait_cv, - ntdll_atan, - ntdll_ceil, - ntdll_cos, - ntdll_fabs, - ntdll_floor, - ntdll_log, - ntdll_pow, - ntdll_sin, - ntdll_sqrt, - ntdll_tan, load_so_dll, init_builtin_dll, init_unix_lib, diff --git a/dlls/ntdll/unixlib.h b/dlls/ntdll/unixlib.h index 4b7c8b45be7..d56259deff2 100644 --- a/dlls/ntdll/unixlib.h +++ b/dlls/ntdll/unixlib.h @@ -26,7 +26,7 @@ struct _DISPATCHER_CONTEXT; /* increment this when you change the function table */ -#define NTDLL_UNIXLIB_VERSION 126 +#define NTDLL_UNIXLIB_VERSION 127 struct unix_funcs { @@ -57,18 +57,6 @@ struct unix_funcs NTSTATUS (CDECL *fast_wait_cv)( RTL_CONDITION_VARIABLE *variable, const void *value, const LARGE_INTEGER *timeout ); - /* math functions */ - double (CDECL *atan)( double d ); - double (CDECL *ceil)( double d ); - double (CDECL *cos)( double d ); - double (CDECL *fabs)( double d ); - double (CDECL *floor)( double d ); - double (CDECL *log)( double d ); - double (CDECL *pow)( double x, double y ); - double (CDECL *sin)( double d ); - double (CDECL *sqrt)( double d ); - double (CDECL *tan)( double d ); - /* loader functions */ NTSTATUS (CDECL *load_so_dll)( UNICODE_STRING *nt_name, void **module ); void (CDECL *init_builtin_dll)( void *module );

1 0

Nikolay Sivov : evr/presenter: Remove scaling by zoom rectangle.
by Alexandre Julliard Oct. 26, 2021

Oct. 26, 2021

Module: wine Branch: master Commit: a1c057c9a75cbb7251648352748983f09390bb57 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a1c057c9a75cbb7251648352… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 26 19:58:30 2021 +0300 evr/presenter: Remove scaling by zoom rectangle. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/presenter.c | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/dlls/evr/presenter.c b/dlls/evr/presenter.c index bf0f89df0eb..b8b18638185 100644 --- a/dlls/evr/presenter.c +++ b/dlls/evr/presenter.c @@ -460,21 +460,6 @@ static HRESULT video_presenter_get_sample_surface(IMFSample *sample, IDirect3DSu return hr; } -static void scale_rect(RECT *rect, unsigned int width, unsigned int height, const MFVideoNormalizedRect *scale) -{ - if (rect->left == 0.0f && rect->top == 0.0f && rect->right == 1.0f && rect->bottom == 1.0f) - { - SetRect(rect, 0, 0, width, height); - } - else - { - rect->left = width * scale->left; - rect->right = width * scale->right; - rect->top = height * scale->top; - rect->bottom = height * scale->bottom; - } -} - static void video_presenter_sample_present(struct video_presenter *presenter, IMFSample *sample) { IDirect3DSurface9 *surface, *backbuffer; @@ -503,7 +488,7 @@ static void video_presenter_sample_present(struct video_presenter *presenter, IM IDirect3DDevice9_StretchRect(device, surface, NULL, backbuffer, NULL, D3DTEXF_POINT); IDirect3DSurface9_GetDesc(surface, &desc); - scale_rect(&src, desc.Width, desc.Height, &presenter->src_rect); + SetRect(&src, 0, 0, desc.Width, desc.Height); IDirect3DSurface9_GetDesc(backbuffer, &desc); SetRect(&dst, 0, 0, desc.Width, desc.Height);

1 0

Alexandre Julliard : ntdll: Copy atan() implementation from msvcrt.
by Alexandre Julliard Oct. 26, 2021

Oct. 26, 2021

Module: wine Branch: master Commit: bb9e068babb9049a09c205ca4bf07fa2744cd26d URL: https://source.winehq.org/git/wine.git/?a=commit;h=bb9e068babb9049a09c205ca… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 26 10:33:30 2021 +0200 ntdll: Copy atan() implementation from msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/math.c | 108 +++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 106 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/math.c b/dlls/ntdll/math.c index 8241e5077c2..25477b44d4a 100644 --- a/dlls/ntdll/math.c +++ b/dlls/ntdll/math.c @@ -16,6 +16,23 @@ * 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 + * + * + * For functions copied from musl libc (http://musl.libc.org/) + * ==================================================== + * Copyright 2005-2020 Rich Felker, et al. + * + * Permission is hereby granted, free of charge, to any person obtaining + * a copy of this software and associated documentation files (the + * "Software"), to deal in the Software without restriction, including + * without limitation the rights to use, copy, modify, merge, publish, + * distribute, sublicense, and/or sell copies of the Software, and to + * permit persons to whom the Software is furnished to do so, subject to + * the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * ==================================================== */ #include <math.h> @@ -24,6 +41,15 @@ #define WIN32_NO_STATUS #include "ntdll_misc.h" +/* Copied from musl: src/internal/libm.h */ +static inline float fp_barrierf(float x) +{ + volatile float y = x; + return y; +} + + + /********************************************************************* * abs (NTDLL.@) */ @@ -34,10 +60,88 @@ int CDECL abs( int i ) /********************************************************************* * atan (NTDLL.@) + * + * Copied from musl: src/math/atan.c */ -double CDECL atan( double d ) +double CDECL atan( double x ) { - return unix_funcs->atan( d ); + 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; + + 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

Alexandre Julliard : ntdll: Move math functions to a separate file.
by Alexandre Julliard Oct. 26, 2021

Oct. 26, 2021

Module: wine Branch: master Commit: c7454eef0bf577545225c7c236a3f3b03daf31d3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c7454eef0bf577545225c7c2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 26 10:33:25 2021 +0200 ntdll: Move math functions to a separate file. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/Makefile.in | 1 + dlls/ntdll/math.c | 177 +++++++++++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/misc.c | 153 ------------------------------------------ 3 files changed, 178 insertions(+), 153 deletions(-) diff --git a/dlls/ntdll/Makefile.in b/dlls/ntdll/Makefile.in index aac7f8eead7..ba23e397545 100644 --- a/dlls/ntdll/Makefile.in +++ b/dlls/ntdll/Makefile.in @@ -22,6 +22,7 @@ C_SRCS = \ large_int.c \ loader.c \ locale.c \ + math.c \ misc.c \ path.c \ printf.c \ diff --git a/dlls/ntdll/math.c b/dlls/ntdll/math.c new file mode 100644 index 00000000000..8241e5077c2 --- /dev/null +++ b/dlls/ntdll/math.c @@ -0,0 +1,177 @@ +/* + * Math functions + * + * Copyright 2021 Alexandre Julliard + * + * 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 <math.h> + +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include "ntdll_misc.h" + +/********************************************************************* + * abs (NTDLL.@) + */ +int CDECL abs( int i ) +{ + return i >= 0 ? i : -i; +} + +/********************************************************************* + * atan (NTDLL.@) + */ +double CDECL atan( double d ) +{ + return unix_funcs->atan( d ); +} + +/********************************************************************* + * ceil (NTDLL.@) + */ +double CDECL ceil( double d ) +{ + return unix_funcs->ceil( d ); +} + +/********************************************************************* + * cos (NTDLL.@) + */ +double CDECL cos( double d ) +{ + return unix_funcs->cos( d ); +} + +/********************************************************************* + * fabs (NTDLL.@) + */ +double CDECL fabs( double d ) +{ + return unix_funcs->fabs( d ); +} + +/********************************************************************* + * floor (NTDLL.@) + */ +double CDECL floor( double d ) +{ + return unix_funcs->floor( d ); +} + +/********************************************************************* + * log (NTDLL.@) + */ +double CDECL log( double d ) +{ + return unix_funcs->log( d ); +} + +/********************************************************************* + * pow (NTDLL.@) + */ +double CDECL pow( double x, double y ) +{ + return unix_funcs->pow( x, y ); +} + +/********************************************************************* + * sin (NTDLL.@) + */ +double CDECL sin( double d ) +{ + return unix_funcs->sin( d ); +} + +/********************************************************************* + * sqrt (NTDLL.@) + */ +double CDECL sqrt( double d ) +{ + return unix_funcs->sqrt( d ); +} + +/********************************************************************* + * tan (NTDLL.@) + */ +double CDECL tan( double d ) +{ + return unix_funcs->tan( d ); +} + +#if (defined(__GNUC__) || defined(__clang__)) && defined(__i386__) + +#define FPU_DOUBLE(var) double var; \ + __asm__ __volatile__( "fstpl %0;fwait" : "=m" (var) : ) +#define FPU_DOUBLES(var1,var2) double var1,var2; \ + __asm__ __volatile__( "fstpl %0;fwait" : "=m" (var2) : ); \ + __asm__ __volatile__( "fstpl %0;fwait" : "=m" (var1) : ) + +/********************************************************************* + * _CIcos (NTDLL.@) + */ +double CDECL _CIcos(void) +{ + FPU_DOUBLE(x); + return cos(x); +} + +/********************************************************************* + * _CIlog (NTDLL.@) + */ +double CDECL _CIlog(void) +{ + FPU_DOUBLE(x); + return log(x); +} + +/********************************************************************* + * _CIpow (NTDLL.@) + */ +double CDECL _CIpow(void) +{ + FPU_DOUBLES(x,y); + return pow(x,y); +} + +/********************************************************************* + * _CIsin (NTDLL.@) + */ +double CDECL _CIsin(void) +{ + FPU_DOUBLE(x); + return sin(x); +} + +/********************************************************************* + * _CIsqrt (NTDLL.@) + */ +double CDECL _CIsqrt(void) +{ + FPU_DOUBLE(x); + return sqrt(x); +} + +/********************************************************************* + * _ftol (NTDLL.@) + */ +LONGLONG CDECL _ftol(void) +{ + FPU_DOUBLE(x); + return (LONGLONG)x; +} + +#endif /* (defined(__GNUC__) || defined(__clang__)) && defined(__i386__) */ diff --git a/dlls/ntdll/misc.c b/dlls/ntdll/misc.c index 092900b289b..3bef5a561c8 100644 --- a/dlls/ntdll/misc.c +++ b/dlls/ntdll/misc.c @@ -20,7 +20,6 @@ */ #include <time.h> -#include <math.h> #include "ntstatus.h" #define WIN32_NO_STATUS @@ -38,158 +37,6 @@ LPCSTR debugstr_us( const UNICODE_STRING *us ) return debugstr_wn(us->Buffer, us->Length / sizeof(WCHAR)); } -/********************************************************************* - * abs (NTDLL.@) - */ -int CDECL abs( int i ) -{ - return i >= 0 ? i : -i; -} - -/********************************************************************* - * atan (NTDLL.@) - */ -double CDECL atan( double d ) -{ - return unix_funcs->atan( d ); -} - -/********************************************************************* - * ceil (NTDLL.@) - */ -double CDECL ceil( double d ) -{ - return unix_funcs->ceil( d ); -} - -/********************************************************************* - * cos (NTDLL.@) - */ -double CDECL cos( double d ) -{ - return unix_funcs->cos( d ); -} - -/********************************************************************* - * fabs (NTDLL.@) - */ -double CDECL fabs( double d ) -{ - return unix_funcs->fabs( d ); -} - -/********************************************************************* - * floor (NTDLL.@) - */ -double CDECL floor( double d ) -{ - return unix_funcs->floor( d ); -} - -/********************************************************************* - * log (NTDLL.@) - */ -double CDECL log( double d ) -{ - return unix_funcs->log( d ); -} - -/********************************************************************* - * pow (NTDLL.@) - */ -double CDECL pow( double x, double y ) -{ - return unix_funcs->pow( x, y ); -} - -/********************************************************************* - * sin (NTDLL.@) - */ -double CDECL sin( double d ) -{ - return unix_funcs->sin( d ); -} - -/********************************************************************* - * sqrt (NTDLL.@) - */ -double CDECL sqrt( double d ) -{ - return unix_funcs->sqrt( d ); -} - -/********************************************************************* - * tan (NTDLL.@) - */ -double CDECL tan( double d ) -{ - return unix_funcs->tan( d ); -} - -#if (defined(__GNUC__) || defined(__clang__)) && defined(__i386__) - -#define FPU_DOUBLE(var) double var; \ - __asm__ __volatile__( "fstpl %0;fwait" : "=m" (var) : ) -#define FPU_DOUBLES(var1,var2) double var1,var2; \ - __asm__ __volatile__( "fstpl %0;fwait" : "=m" (var2) : ); \ - __asm__ __volatile__( "fstpl %0;fwait" : "=m" (var1) : ) - -/********************************************************************* - * _CIcos (NTDLL.@) - */ -double CDECL _CIcos(void) -{ - FPU_DOUBLE(x); - return cos(x); -} - -/********************************************************************* - * _CIlog (NTDLL.@) - */ -double CDECL _CIlog(void) -{ - FPU_DOUBLE(x); - return log(x); -} - -/********************************************************************* - * _CIpow (NTDLL.@) - */ -double CDECL _CIpow(void) -{ - FPU_DOUBLES(x,y); - return pow(x,y); -} - -/********************************************************************* - * _CIsin (NTDLL.@) - */ -double CDECL _CIsin(void) -{ - FPU_DOUBLE(x); - return sin(x); -} - -/********************************************************************* - * _CIsqrt (NTDLL.@) - */ -double CDECL _CIsqrt(void) -{ - FPU_DOUBLE(x); - return sqrt(x); -} - -/********************************************************************* - * _ftol (NTDLL.@) - */ -LONGLONG CDECL _ftol(void) -{ - FPU_DOUBLE(x); - return (LONGLONG)x; -} - -#endif /* (defined(__GNUC__) || defined(__clang__)) && defined(__i386__) */ - static void NTDLL_mergesort( void *arr, void *barr, size_t elemsize, int(__cdecl *compar)(const void *, const void *), size_t left, size_t right )

1 0

Rémi Bernon : dinput: Call hid_joystick_enum_device directly in JoyConfig8Impl_GetConfig.
by Alexandre Julliard Oct. 26, 2021

Oct. 26, 2021

Module: wine Branch: master Commit: bbff12381ed841dc84c982d9a830801b727e8d18 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bbff12381ed841dc84c982d9… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Oct 26 09:17:31 2021 +0200 dinput: Call hid_joystick_enum_device directly in JoyConfig8Impl_GetConfig. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/dinput_main.c | 41 ++++++++++------------------------------- dlls/dinput/dinput_private.h | 11 ----------- dlls/dinput/joystick_hid.c | 7 ------- dlls/dinput/keyboard.c | 6 ------ dlls/dinput/mouse.c | 6 ------ 5 files changed, 10 insertions(+), 61 deletions(-) diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index 745fdafa920..bc033a1baca 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -74,13 +74,6 @@ static inline IDirectInputDeviceImpl *impl_from_IDirectInputDevice8W(IDirectInpu return CONTAINING_RECORD(iface, IDirectInputDeviceImpl, IDirectInputDevice8W_iface); } -static const struct dinput_device *dinput_devices[] = -{ - &mouse_device, - &keyboard_device, - &joystick_hid_device, -}; - HINSTANCE DINPUT_instance; static HWND di_em_win; @@ -927,10 +920,11 @@ static HRESULT WINAPI JoyConfig8Impl_DeleteType(IDirectInputJoyConfig8 *iface, L static HRESULT WINAPI JoyConfig8Impl_GetConfig(IDirectInputJoyConfig8 *iface, UINT id, LPDIJOYCONFIG info, DWORD flags) { + DIDEVICEINSTANCEW instance = {.dwSize = sizeof(DIDEVICEINSTANCEW)}; IDirectInputImpl *di = impl_from_IDirectInputJoyConfig8(iface); + unsigned int i = 0; UINT found = 0; - int i, j; - HRESULT r; + HRESULT hr; FIXME("(%p)->(%d, %p, 0x%08x): semi-stub!\n", iface, id, info, flags); @@ -941,29 +935,14 @@ static HRESULT WINAPI JoyConfig8Impl_GetConfig(IDirectInputJoyConfig8 *iface, UI X(DIJC_CALLOUT) #undef X - /* Enumerate all joysticks in order */ - for (i = 0; i < ARRAY_SIZE(dinput_devices); i++) + do { - if (!dinput_devices[i]->enum_device) continue; - - for (j = 0, r = S_OK; SUCCEEDED(r); j++) - { - DIDEVICEINSTANCEW dev; - dev.dwSize = sizeof(dev); - if ((r = dinput_devices[i]->enum_device(DI8DEVCLASS_GAMECTRL, 0, &dev, di->dwVersion, j)) == S_OK) - { - /* Only take into account the chosen id */ - if (found == id) - { - if (flags & DIJC_GUIDINSTANCE) - info->guidInstance = dev.guidInstance; - - return DI_OK; - } - found += 1; - } - } - } + hr = hid_joystick_enum_device( DI8DEVCLASS_GAMECTRL, 0, &instance, di->dwVersion, i++ ); + if (hr != DI_OK) continue; + if (flags & DIJC_GUIDINSTANCE) info->guidInstance = instance.guidInstance; + /* Only take into account the chosen id */ + if (found++ == id) return DI_OK; + } while (SUCCEEDED(hr)); return DIERR_NOMOREITEMS; } diff --git a/dlls/dinput/dinput_private.h b/dlls/dinput/dinput_private.h index e9b40bb95b6..461af021a30 100644 --- a/dlls/dinput/dinput_private.h +++ b/dlls/dinput/dinput_private.h @@ -52,13 +52,6 @@ struct IDirectInputImpl extern const IDirectInput7AVtbl dinput7_a_vtbl DECLSPEC_HIDDEN; extern const IDirectInput8AVtbl dinput8_a_vtbl DECLSPEC_HIDDEN; -/* Function called by all devices that Wine supports */ -struct dinput_device { - const char *name; - HRESULT (*enum_device)(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEINSTANCEW lpddi, DWORD version, int id); - HRESULT (*create_device)(IDirectInputImpl *dinput, REFGUID rguid, IDirectInputDevice8W **out); -}; - extern HRESULT mouse_enum_device( DWORD type, DWORD flags, DIDEVICEINSTANCEW *instance, DWORD version, int index ); extern HRESULT mouse_create_device( IDirectInputImpl *dinput, const GUID *guid, IDirectInputDevice8W **out ); extern HRESULT keyboard_enum_device( DWORD type, DWORD flags, DIDEVICEINSTANCEW *instance, DWORD version, int index ); @@ -72,10 +65,6 @@ struct DevicePlayer { struct list entry; }; -extern const struct dinput_device mouse_device DECLSPEC_HIDDEN; -extern const struct dinput_device keyboard_device DECLSPEC_HIDDEN; -extern const struct dinput_device joystick_hid_device DECLSPEC_HIDDEN; - extern void dinput_hooks_acquire_device(LPDIRECTINPUTDEVICE8W iface); extern void dinput_hooks_unacquire_device(LPDIRECTINPUTDEVICE8W iface); extern int dinput_mouse_hook( IDirectInputDevice8W *iface, WPARAM wparam, LPARAM lparam ); diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index 3419fed7d79..4632109a35b 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -1867,13 +1867,6 @@ failed: return hr; } -const struct dinput_device joystick_hid_device = -{ - "Wine HID joystick driver", - hid_joystick_enum_device, - hid_joystick_create_device, -}; - static HRESULT WINAPI hid_joystick_effect_QueryInterface( IDirectInputEffect *iface, REFIID iid, void **out ) { TRACE( "iface %p, iid %s, out %p\n", iface, debugstr_guid( iid ), out ); diff --git a/dlls/dinput/keyboard.c b/dlls/dinput/keyboard.c index 3b8f52b38f2..a6032cbd0a4 100644 --- a/dlls/dinput/keyboard.c +++ b/dlls/dinput/keyboard.c @@ -204,12 +204,6 @@ HRESULT keyboard_create_device( IDirectInputImpl *dinput, const GUID *guid, IDir return DI_OK; } -const struct dinput_device keyboard_device = { - "Wine keyboard driver", - keyboard_enum_device, - keyboard_create_device -}; - static HRESULT keyboard_poll( IDirectInputDevice8W *iface ) { check_dinput_events(); diff --git a/dlls/dinput/mouse.c b/dlls/dinput/mouse.c index 325d38c90d3..84b5410bb36 100644 --- a/dlls/dinput/mouse.c +++ b/dlls/dinput/mouse.c @@ -153,12 +153,6 @@ HRESULT mouse_create_device( IDirectInputImpl *dinput, const GUID *guid, IDirect return DI_OK; } -const struct dinput_device mouse_device = { - "Wine mouse driver", - mouse_enum_device, - mouse_create_device -}; - /****************************************************************************** * SysMouseA (DInput Mouse support) */

1 0

Huw Davies : winspool: Move loading of libcups to cups.c.
by Alexandre Julliard Oct. 26, 2021

Oct. 26, 2021

Module: wine Branch: master Commit: 4bb4d90c7022883b8e14ba7ad1c65dad27b0cd5b URL: https://source.winehq.org/git/wine.git/?a=commit;h=4bb4d90c7022883b8e14ba7a… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Oct 26 11:18:07 2021 +0100 winspool: Move loading of libcups to cups.c. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winspool.drv/Makefile.in | 1 + dlls/winspool.drv/cups.c | 101 ++++++++++++++++++++++++++++++++++++++++++ dlls/winspool.drv/info.c | 40 +++-------------- dlls/winspool.drv/wspool.c | 31 ++++++------- dlls/winspool.drv/wspool.h | 5 +++ 5 files changed, 130 insertions(+), 48 deletions(-) diff --git a/dlls/winspool.drv/Makefile.in b/dlls/winspool.drv/Makefile.in index a0d0f9504f2..d40813d649c 100644 --- a/dlls/winspool.drv/Makefile.in +++ b/dlls/winspool.drv/Makefile.in @@ -8,6 +8,7 @@ EXTRALIBS = $(APPLICATIONSERVICES_LIBS) EXTRADLLFLAGS = -mcygwin C_SRCS = \ + cups.c \ info.c \ wspool.c diff --git a/dlls/winspool.drv/cups.c b/dlls/winspool.drv/cups.c new file mode 100644 index 00000000000..207c95c568a --- /dev/null +++ b/dlls/winspool.drv/cups.c @@ -0,0 +1,101 @@ +/* + * CUPS functions + * + * Copyright 2021 Huw Davies + * + * 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 "config.h" +#include "wine/port.h" + +#include <stdarg.h> +#include <string.h> +#ifdef HAVE_CUPS_CUPS_H +#include <cups/cups.h> +#endif +#ifdef HAVE_CUPS_PPD_H +#include <cups/ppd.h> +#endif + +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include "windef.h" +#include "winbase.h" +#include "winternl.h" +#include "winuser.h" +#include "winerror.h" +#include "winreg.h" +#include "wingdi.h" +#include "winspool.h" +#include "ddk/winsplp.h" +#include "wine/debug.h" + +#include "wspool.h" + +WINE_DEFAULT_DEBUG_CHANNEL(winspool); + +#ifdef SONAME_LIBCUPS + +void *libcups_handle = NULL; + +#define CUPS_FUNCS \ + DO_FUNC(cupsAddOption); \ + DO_FUNC(cupsFreeDests); \ + DO_FUNC(cupsFreeOptions); \ + DO_FUNC(cupsGetDests); \ + DO_FUNC(cupsGetOption); \ + DO_FUNC(cupsParseOptions); \ + DO_FUNC(cupsPrintFile) +#define CUPS_OPT_FUNCS \ + DO_FUNC(cupsGetNamedDest); \ + DO_FUNC(cupsGetPPD); \ + DO_FUNC(cupsGetPPD3); \ + DO_FUNC(cupsLastErrorString) + +#define DO_FUNC(f) typeof(f) *p##f = NULL +CUPS_FUNCS; +#undef DO_FUNC +cups_dest_t * (*pcupsGetNamedDest)(http_t *, const char *, const char *) = NULL; +const char * (*pcupsGetPPD)(const char *) = NULL; +http_status_t (*pcupsGetPPD3)(http_t *, const char *, time_t *, char *, size_t) = NULL; +const char * (*pcupsLastErrorString)(void) = NULL; + +#endif /* SONAME_LIBCUPS */ + +NTSTATUS unix_process_attach( void *arg ) +{ +#ifdef SONAME_LIBCUPS + libcups_handle = dlopen( SONAME_LIBCUPS, RTLD_NOW ); + TRACE( "%p: %s loaded\n", libcups_handle, SONAME_LIBCUPS ); + if (!libcups_handle) return STATUS_DLL_NOT_FOUND; + +#define DO_FUNC(x) \ + p##x = dlsym( libcups_handle, #x ); \ + if (!p##x) \ + { \ + ERR( "failed to load symbol %s\n", #x ); \ + libcups_handle = NULL; \ + return STATUS_ENTRYPOINT_NOT_FOUND; \ + } + CUPS_FUNCS; +#undef DO_FUNC +#define DO_FUNC(x) p##x = dlsym( libcups_handle, #x ) + CUPS_OPT_FUNCS; +#undef DO_FUNC + return STATUS_SUCCESS; +#else /* SONAME_LIBCUPS */ + return STATUS_NOT_SUPPORTED; +#endif /* SONAME_LIBCUPS */ +} diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 660a5afe74d..fd02d2b2b3e 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -967,7 +967,7 @@ static void unlink_ppd( const WCHAR *ppd ) #ifdef SONAME_LIBCUPS -static void *cupshandle; +extern void *libcups_handle; #define CUPS_FUNCS \ DO_FUNC(cupsAddOption); \ @@ -983,13 +983,13 @@ static void *cupshandle; DO_FUNC(cupsGetPPD3); \ DO_FUNC(cupsLastErrorString) -#define DO_FUNC(f) static typeof(f) *p##f +#define DO_FUNC(f) extern typeof(f) *p##f CUPS_FUNCS; #undef DO_FUNC -static cups_dest_t * (*pcupsGetNamedDest)(http_t *, const char *, const char *); -static const char * (*pcupsGetPPD)(const char *); -static http_status_t (*pcupsGetPPD3)(http_t *, const char *, time_t *, char *, size_t); -static const char * (*pcupsLastErrorString)(void); +extern cups_dest_t * (*pcupsGetNamedDest)(http_t *, const char *, const char *); +extern const char * (*pcupsGetPPD)(const char *); +extern http_status_t (*pcupsGetPPD3)(http_t *, const char *, time_t *, char *, size_t); +extern const char * (*pcupsLastErrorString)(void); static http_status_t cupsGetPPD3_wrapper( http_t *http, const char *name, time_t *modtime, char *buffer, @@ -1072,28 +1072,6 @@ static cups_ptype_t get_cups_printer_type( const cups_dest_t *dest ) return ret; } -static void load_cups(void) -{ - cupshandle = dlopen( SONAME_LIBCUPS, RTLD_NOW ); - if (!cupshandle) return; - - TRACE("%p: %s loaded\n", cupshandle, SONAME_LIBCUPS); - -#define DO_FUNC(x) \ - p##x = dlsym( cupshandle, #x ); \ - if (!p##x) \ - { \ - ERR("failed to load symbol %s\n", #x); \ - cupshandle = NULL; \ - return; \ - } - CUPS_FUNCS; -#undef DO_FUNC -#define DO_FUNC(x) p##x = dlsym( cupshandle, #x ) - CUPS_OPT_FUNCS; -#undef DO_FUNC -} - static BOOL CUPS_LoadPrinters(void) { int i, nrofdests; @@ -1106,7 +1084,7 @@ static BOOL CUPS_LoadPrinters(void) HANDLE added_printer; cups_ptype_t printer_type; - if (!cupshandle) return FALSE; + if (!libcups_handle) return FALSE; if(RegCreateKeyW(HKEY_LOCAL_MACHINE, PrintersW, &hkeyPrinters) != ERROR_SUCCESS) { @@ -1807,10 +1785,6 @@ void WINSPOOL_LoadSystemPrinters(void) WCHAR PrinterName[256]; BOOL done = FALSE; -#ifdef SONAME_LIBCUPS - load_cups(); -#endif - /* FIXME: The init code should be moved to spoolsv.exe */ init_mutex = CreateMutexW( NULL, TRUE, winspool_mutex_name ); if (!init_mutex) diff --git a/dlls/winspool.drv/wspool.c b/dlls/winspool.drv/wspool.c index bbfb0fb0f42..90d35bee73e 100644 --- a/dlls/winspool.drv/wspool.c +++ b/dlls/winspool.drv/wspool.c @@ -110,22 +110,23 @@ BOOL load_backend(void) * Winspool entry point. * */ -BOOL WINAPI DllMain(HINSTANCE hInstance, DWORD reason, LPVOID lpReserved) +BOOL WINAPI DllMain( HINSTANCE instance, DWORD reason, void *reserved ) { - switch (reason) - { - case DLL_PROCESS_ATTACH: { - WINSPOOL_hInstance = hInstance; - DisableThreadLibraryCalls(hInstance); - WINSPOOL_LoadSystemPrinters(); - break; - } + switch (reason) + { + case DLL_PROCESS_ATTACH: + WINSPOOL_hInstance = instance; + DisableThreadLibraryCalls( instance ); + UNIX_CALL( process_attach, NULL ); + WINSPOOL_LoadSystemPrinters(); + break; + case DLL_PROCESS_DETACH: - if (lpReserved) break; - DeleteCriticalSection(&backend_cs); - FreeLibrary(hlocalspl); - break; - } + if (reserved) break; + DeleteCriticalSection(&backend_cs); + FreeLibrary(hlocalspl); + break; + } - return TRUE; + return TRUE; } diff --git a/dlls/winspool.drv/wspool.h b/dlls/winspool.drv/wspool.h index 06c28231330..bca4a5ea02d 100644 --- a/dlls/winspool.drv/wspool.h +++ b/dlls/winspool.drv/wspool.h @@ -21,6 +21,7 @@ #include <windef.h> #include <winuser.h> +#include <winternl.h> extern HINSTANCE WINSPOOL_hInstance DECLSPEC_HIDDEN; @@ -35,3 +36,7 @@ extern void WINSPOOL_LoadSystemPrinters(void) DECLSPEC_HIDDEN; #define FILENAME_DIALOG 100 #define EDITBOX 201 + +#define UNIX_CALL( func, params ) unix_ ## func( params ) + +NTSTATUS unix_process_attach( void * ) DECLSPEC_HIDDEN;

1 0