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

Hans Leidekker : webservices/tests: Add an async client test.
by Alexandre Julliard 17 May '21

17 May '21

Module: wine Branch: master Commit: d5eedfc39eacd05f82b25a3c2382b1d952b6fdf4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d5eedfc39eacd05f82b25a3c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon May 17 15:36:15 2021 +0200 webservices/tests: Add an async client test. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/tests/channel.c | 108 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 108 insertions(+) diff --git a/dlls/webservices/tests/channel.c b/dlls/webservices/tests/channel.c index f27b2a3337d..ed6e9e829bf 100644 --- a/dlls/webservices/tests/channel.c +++ b/dlls/webservices/tests/channel.c @@ -678,6 +678,107 @@ static void client_duplex_session( const struct listener_info *info ) WsFreeChannel( channel ); } +static void client_duplex_session_async( const struct listener_info *info ) +{ + WS_XML_STRING action = {6, (BYTE *)"action"}, localname = {9, (BYTE *)"localname"}, ns = {2, (BYTE *)"ns"}; + WS_ELEMENT_DESCRIPTION desc_body; + WS_MESSAGE_DESCRIPTION desc; + WS_ENDPOINT_ADDRESS addr; + WS_ASYNC_CONTEXT ctx; + struct async_test test; + WCHAR buf[64]; + WS_CHANNEL *channel; + WS_MESSAGE *msg, *msg2; + INT32 val = -1; + HRESULT hr; + DWORD err; + + err = WaitForSingleObject( info->ready, 3000 ); + ok( err == WAIT_OBJECT_0, "wait failed %u\n", err ); + + hr = WsCreateChannel( info->type, info->binding, NULL, 0, NULL, &channel, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsShutdownSessionChannel( channel, NULL, NULL ); + ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); + + test.call_count = 0; + test.wait = CreateEventW( NULL, FALSE, FALSE, NULL ); + ctx.callback = async_callback; + ctx.callbackState = &test; + + memset( &addr, 0, sizeof(addr) ); + addr.url.length = wsprintfW( buf, L"net.tcp://localhost:%u", info->port ); + addr.url.chars = buf; + hr = WsOpenChannel( channel, &addr, &ctx, NULL ); + ok( hr == WS_S_ASYNC || hr == S_OK, "got %08x\n", hr ); + if (hr == WS_S_ASYNC) + { + WaitForSingleObject( test.wait, INFINITE ); + ok( test.call_count == 1, "got %u\n", test.call_count ); + } + else ok( !test.call_count, "got %u\n", test.call_count ); + + hr = WsCreateMessageForChannel( channel, NULL, 0, &msg, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + desc_body.elementLocalName = &localname; + desc_body.elementNs = &ns; + desc_body.type = WS_INT32_TYPE; + desc_body.typeDescription = NULL; + desc.action = &action; + desc.bodyElementDescription = &desc_body; + + /* asynchronous call */ + test.call_count = 0; + hr = WsSendMessage( channel, msg, &desc, WS_WRITE_REQUIRED_VALUE, &val, sizeof(val), &ctx, NULL ); + ok( hr == WS_S_ASYNC || hr == S_OK, "got %08x\n", hr ); + if (hr == WS_S_ASYNC) + { + WaitForSingleObject( test.wait, INFINITE ); + ok( test.call_count == 1, "got %u\n", test.call_count ); + } + else ok( !test.call_count, "got %u\n", test.call_count ); + + hr = WsCreateMessageForChannel( channel, NULL, 0, &msg2, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + /* synchronous call */ + hr = WsSendMessage( channel, msg2, &desc, WS_WRITE_REQUIRED_VALUE, &val, sizeof(val), NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + test.call_count = 0; + hr = WsShutdownSessionChannel( channel, &ctx, NULL ); + ok( hr == WS_S_ASYNC || hr == S_OK, "got %08x\n", hr ); + if (hr == WS_S_ASYNC) + { + WaitForSingleObject( test.wait, INFINITE ); + ok( test.call_count == 1, "got %u\n", test.call_count ); + } + else ok( !test.call_count, "got %u\n", test.call_count ); + + hr = WsShutdownSessionChannel( channel, NULL, NULL ); + ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); + + test.call_count = 0; + hr = WsCloseChannel( channel, &ctx, NULL ); + ok( hr == WS_S_ASYNC || hr == S_OK, "got %08x\n", hr ); + if (hr == WS_S_ASYNC) + { + WaitForSingleObject( test.wait, INFINITE ); + ok( test.call_count == 1, "got %u\n", test.call_count ); + } + else ok( !test.call_count, "got %u\n", test.call_count ); + + err = WaitForSingleObject( info->done, 3000 ); + ok( err == WAIT_OBJECT_0, "wait failed %u\n", err ); + + CloseHandle( test.wait ); + WsFreeMessage( msg ); + WsFreeMessage( msg2 ); + WsFreeChannel( channel ); +} + static void server_accept_channel( WS_CHANNEL *channel ) { WS_XML_STRING localname = {9, (BYTE *)"localname"}, ns = {2, (BYTE *)"ns"}, action = {6, (BYTE *)"action"}; @@ -882,6 +983,7 @@ static DWORD CALLBACK listener_proc( void *arg ) const WCHAR *fmt = (info->binding == WS_TCP_CHANNEL_BINDING) ? L"net.tcp://localhost:%u" : L"soap.udp://localhost:%u"; WS_LISTENER *listener; WS_CHANNEL *channel; + WS_CHANNEL_STATE state; WCHAR buf[64]; WS_STRING url; HRESULT hr; @@ -902,6 +1004,11 @@ static DWORD CALLBACK listener_proc( void *arg ) hr = WsAcceptChannel( listener, channel, NULL, NULL ); ok( hr == S_OK, "got %08x\n", hr ); + state = 0xdeadbeef; + hr = WsGetChannelProperty( channel, WS_CHANNEL_PROPERTY_STATE, &state, sizeof(state), NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( state == WS_CHANNEL_STATE_OPEN, "got %u\n", state ); + info->server_func( channel ); SetEvent( info->done ); @@ -1065,6 +1172,7 @@ START_TEST(channel) { WS_UDP_CHANNEL_BINDING, WS_CHANNEL_TYPE_DUPLEX, server_accept_channel, client_accept_channel }, { WS_TCP_CHANNEL_BINDING, WS_CHANNEL_TYPE_DUPLEX_SESSION, server_accept_channel, client_accept_channel }, { WS_TCP_CHANNEL_BINDING, WS_CHANNEL_TYPE_DUPLEX_SESSION, server_request_reply, client_request_reply }, + { WS_TCP_CHANNEL_BINDING, WS_CHANNEL_TYPE_DUPLEX_SESSION, server_duplex_session, client_duplex_session_async }, }; if (firewall_enabled)

1 0

Piotr Caban : msvcrt: Import cbrtf implementation from musl.
by Alexandre Julliard 17 May '21

17 May '21

Module: wine Branch: master Commit: 09bcc133f0d2ddfd0b88d966fdaab2a741c9e3ff URL: https://source.winehq.org/git/wine.git/?a=commit;h=09bcc133f0d2ddfd0b88d966… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon May 17 15:37:51 2021 +0200 msvcrt: Import cbrtf 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 | 30 +++++++++++++++++++++++++++++- dlls/msvcrt/unixlib.c | 13 ------------- dlls/msvcrt/unixlib.h | 1 - include/config.h.in | 3 --- 6 files changed, 29 insertions(+), 20 deletions(-) diff --git a/configure b/configure index 886a463a92a..3cbe4bed79e 100755 --- a/configure +++ b/configure @@ -19623,7 +19623,6 @@ for ac_func in \ atanh \ atanhf \ cbrt \ - cbrtf \ erf \ erfc \ erfcf \ diff --git a/configure.ac b/configure.ac index 2b126a7c579..845b076a8ba 100644 --- a/configure.ac +++ b/configure.ac @@ -2663,7 +2663,6 @@ AC_CHECK_FUNCS(\ atanh \ atanhf \ cbrt \ - cbrtf \ erf \ erfc \ erfcf \ diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 41096ded6e4..db59f5a0787 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -4505,10 +4505,38 @@ double CDECL cbrt(double x) /********************************************************************* * cbrtf (MSVCR120.@) + * + * Copied from musl: src/math/cbrtf.c */ float CDECL cbrtf(float x) { - return unix_funcs->cbrtf( x ); + static const unsigned B1 = 709958130, B2 = 642849266; + + double r,T; + union {float f; UINT32 i;} u = {x}; + UINT32 hx = u.i & 0x7fffffff; + + if (hx >= 0x7f800000) + return x + x; + + if (hx < 0x00800000) { /* zero or subnormal? */ + if (hx == 0) + return x; + u.f = x * 0x1p24f; + hx = u.i & 0x7fffffff; + hx = hx / 3 + B2; + } else + hx = hx / 3 + B1; + u.i &= 0x80000000; + u.i |= hx; + + T = u.f; + r = T * T * T; + T = T * (x + x + r) / (x + r + r); + + r = T * T * T; + T = T * (x + x + r) / (x + r + r); + return T; } /********************************************************************* diff --git a/dlls/msvcrt/unixlib.c b/dlls/msvcrt/unixlib.c index a5b59bc2cf3..56c70742133 100644 --- a/dlls/msvcrt/unixlib.c +++ b/dlls/msvcrt/unixlib.c @@ -133,18 +133,6 @@ static double CDECL unix_cbrt(double x) #endif } -/********************************************************************* - * cbrtf - */ -static float CDECL unix_cbrtf(float x) -{ -#ifdef HAVE_CBRTF - return cbrtf(x); -#else - return unix_cbrt(x); -#endif -} - /********************************************************************* * ceil */ @@ -738,7 +726,6 @@ static const struct unix_funcs funcs = unix_atanh, unix_atanhf, unix_cbrt, - unix_cbrtf, unix_ceil, unix_ceilf, unix_cos, diff --git a/dlls/msvcrt/unixlib.h b/dlls/msvcrt/unixlib.h index 3d41967a2a0..c3b2b500c6d 100644 --- a/dlls/msvcrt/unixlib.h +++ b/dlls/msvcrt/unixlib.h @@ -30,7 +30,6 @@ struct unix_funcs double (CDECL *atanh)(double x); float (CDECL *atanhf)(float x); double (CDECL *cbrt)(double x); - float (CDECL *cbrtf)(float x); double (CDECL *ceil)(double x); float (CDECL *ceilf)(float x); double (CDECL *cos)(double x); diff --git a/include/config.h.in b/include/config.h.in index 56f3bc90003..34103b765fc 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -70,9 +70,6 @@ /* Define to 1 if you have the `cbrt' function. */ #undef HAVE_CBRT -/* Define to 1 if you have the `cbrtf' function. */ -#undef HAVE_CBRTF - /* Define to 1 if you have the `clock_gettime' function. */ #undef HAVE_CLOCK_GETTIME

1 0

Piotr Caban : msvcrt: Import cbrt implementation from musl.
by Alexandre Julliard 17 May '21

17 May '21

Module: wine Branch: master Commit: e5d667de2f2c070e71db4e15cea764f238df6fe2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e5d667de2f2c070e71db4e15… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon May 17 15:37:55 2021 +0200 msvcrt: Import cbrt 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 | 42 +++++++++++++++++++++++++++++++++++++++++- dlls/msvcrt/unixlib.c | 13 ------------- dlls/msvcrt/unixlib.h | 1 - include/config.h.in | 3 --- 6 files changed, 41 insertions(+), 20 deletions(-) diff --git a/configure b/configure index 3cbe4bed79e..69b97958832 100755 --- a/configure +++ b/configure @@ -19622,7 +19622,6 @@ for ac_func in \ asinhf \ atanh \ atanhf \ - cbrt \ erf \ erfc \ erfcf \ diff --git a/configure.ac b/configure.ac index 845b076a8ba..7fde36f7616 100644 --- a/configure.ac +++ b/configure.ac @@ -2662,7 +2662,6 @@ AC_CHECK_FUNCS(\ asinhf \ atanh \ atanhf \ - cbrt \ erf \ erfc \ erfcf \ diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index db59f5a0787..3c4abd5630c 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -4497,10 +4497,50 @@ short CDECL _dclass(double x) /********************************************************************* * cbrt (MSVCR120.@) + * + * Copied from musl: src/math/cbrt.c */ double CDECL cbrt(double x) { - return unix_funcs->cbrt( x ); + static const UINT32 B1 = 715094163, B2 = 696219795; + static const double P0 = 1.87595182427177009643, + P1 = -1.88497979543377169875, + P2 = 1.621429720105354466140, + P3 = -0.758397934778766047437, + P4 = 0.145996192886612446982; + + union {double f; UINT64 i;} u = {x}; + double r,s,t,w; + UINT32 hx = u.i >> 32 & 0x7fffffff; + + if (hx >= 0x7ff00000) /* cbrt(NaN,INF) is itself */ + return x + x; + + if (hx < 0x00100000) { /* zero or subnormal? */ + u.f = x * 0x1p54; + hx = u.i>>32 & 0x7fffffff; + if (hx == 0) + return x; + hx = hx / 3 + B2; + } else + hx = hx / 3 + B1; + u.i &= 1ULL << 63; + u.i |= (UINT64)hx << 32; + t = u.f; + + r = (t * t) * (t / x); + t = t * ((P0 + r * (P1 + r * P2)) + ((r * r) * r) * (P3 + r * P4)); + + u.f = t; + u.i = (u.i + 0x80000000) & 0xffffffffc0000000ULL; + t = u.f; + + s = t * t; + r = x / s; + w = t + t; + r = (r - t) / (w + r); + t = t + t * r; + return t; } /********************************************************************* diff --git a/dlls/msvcrt/unixlib.c b/dlls/msvcrt/unixlib.c index 56c70742133..1c4f1254a53 100644 --- a/dlls/msvcrt/unixlib.c +++ b/dlls/msvcrt/unixlib.c @@ -121,18 +121,6 @@ static float CDECL unix_atanhf(float x) #endif } -/********************************************************************* - * cbrt - */ -static double CDECL unix_cbrt(double x) -{ -#ifdef HAVE_CBRT - return cbrt(x); -#else - return x < 0 ? -pow(-x, 1.0 / 3.0) : pow(x, 1.0 / 3.0); -#endif -} - /********************************************************************* * ceil */ @@ -725,7 +713,6 @@ static const struct unix_funcs funcs = unix_asinhf, unix_atanh, unix_atanhf, - unix_cbrt, unix_ceil, unix_ceilf, unix_cos, diff --git a/dlls/msvcrt/unixlib.h b/dlls/msvcrt/unixlib.h index c3b2b500c6d..ec380e106d4 100644 --- a/dlls/msvcrt/unixlib.h +++ b/dlls/msvcrt/unixlib.h @@ -29,7 +29,6 @@ struct unix_funcs float (CDECL *asinhf)(float x); double (CDECL *atanh)(double x); float (CDECL *atanhf)(float x); - double (CDECL *cbrt)(double x); double (CDECL *ceil)(double x); float (CDECL *ceilf)(float x); double (CDECL *cos)(double x); diff --git a/include/config.h.in b/include/config.h.in index 34103b765fc..ce83ecacd8e 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -67,9 +67,6 @@ /* Define to 1 if you have the <Carbon/Carbon.h> header file. */ #undef HAVE_CARBON_CARBON_H -/* Define to 1 if you have the `cbrt' function. */ -#undef HAVE_CBRT - /* Define to 1 if you have the `clock_gettime' function. */ #undef HAVE_CLOCK_GETTIME

1 0

Piotr Caban : msvcrt: Import ceil implementation from musl.
by Alexandre Julliard 17 May '21

17 May '21

Module: wine Branch: master Commit: 2a5e68ab807939b1b5b1484a189717b659b0a28e URL: https://source.winehq.org/git/wine.git/?a=commit;h=2a5e68ab807939b1b5b1484a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon May 17 15:38:01 2021 +0200 msvcrt: Import ceil implementation from musl. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 23 ++++++++++++++++++++++- dlls/msvcrt/unixlib.c | 9 --------- dlls/msvcrt/unixlib.h | 1 - 3 files changed, 22 insertions(+), 11 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 3c4abd5630c..a4dd61f881c 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -1740,10 +1740,31 @@ float CDECL _hypotf(float x, float y) /********************************************************************* * ceil (MSVCRT.@) + * + * Based on musl: src/math/ceilf.c */ double CDECL ceil( double x ) { - return unix_funcs->ceil(x); + union {double f; UINT64 i;} u = {x}; + int e = (u.i >> 52 & 0x7ff) - 0x3ff; + UINT64 m; + + if (e >= 52) + return x; + if (e >= 0) { + m = 0x000fffffffffffffULL >> e; + if ((u.i & m) == 0) + return x; + if (u.i >> 63 == 0) + u.i += m; + u.i &= ~m; + } else { + if (u.i >> 63) + return -0.0; + else if (u.i << 1) + return 1.0; + } + return u.f; } /********************************************************************* diff --git a/dlls/msvcrt/unixlib.c b/dlls/msvcrt/unixlib.c index 1c4f1254a53..9d9f86b7358 100644 --- a/dlls/msvcrt/unixlib.c +++ b/dlls/msvcrt/unixlib.c @@ -121,14 +121,6 @@ static float CDECL unix_atanhf(float x) #endif } -/********************************************************************* - * ceil - */ -static double CDECL unix_ceil( double x ) -{ - return ceil( x ); -} - /********************************************************************* * ceilf */ @@ -713,7 +705,6 @@ static const struct unix_funcs funcs = unix_asinhf, unix_atanh, unix_atanhf, - unix_ceil, unix_ceilf, unix_cos, unix_cosf, diff --git a/dlls/msvcrt/unixlib.h b/dlls/msvcrt/unixlib.h index ec380e106d4..70d955d5e4f 100644 --- a/dlls/msvcrt/unixlib.h +++ b/dlls/msvcrt/unixlib.h @@ -29,7 +29,6 @@ struct unix_funcs float (CDECL *asinhf)(float x); double (CDECL *atanh)(double x); float (CDECL *atanhf)(float x); - double (CDECL *ceil)(double x); float (CDECL *ceilf)(float x); double (CDECL *cos)(double x); float (CDECL *cosf)(float x);

1 0

Piotr Caban : msvcrt: Import ceilf implementation from musl.
by Alexandre Julliard 17 May '21

17 May '21

Module: wine Branch: master Commit: bba43bd6dad0dd96ec547a6630cd34a4c80887df URL: https://source.winehq.org/git/wine.git/?a=commit;h=bba43bd6dad0dd96ec547a66… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon May 17 15:38:08 2021 +0200 msvcrt: Import ceilf implementation from musl. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 23 ++++++++++++++++++++++- dlls/msvcrt/unixlib.c | 9 --------- dlls/msvcrt/unixlib.h | 1 - 3 files changed, 22 insertions(+), 11 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index a4dd61f881c..5502e2934e9 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -798,10 +798,31 @@ float CDECL tanhf( float x ) /********************************************************************* * ceilf (MSVCRT.@) + * + * Copied from musl: src/math/ceilf.c */ float CDECL ceilf( float x ) { - return unix_funcs->ceilf(x); + union {float f; UINT32 i;} u = {x}; + int e = (int)(u.i >> 23 & 0xff) - 0x7f; + UINT32 m; + + if (e >= 23) + return x; + if (e >= 0) { + m = 0x007fffff >> e; + if ((u.i & m) == 0) + return x; + if (u.i >> 31 == 0) + u.i += m; + u.i &= ~m; + } else { + if (u.i >> 31) + return -0.0; + else if (u.i << 1) + return 1.0; + } + return u.f; } /********************************************************************* diff --git a/dlls/msvcrt/unixlib.c b/dlls/msvcrt/unixlib.c index 9d9f86b7358..634ab6f1a4b 100644 --- a/dlls/msvcrt/unixlib.c +++ b/dlls/msvcrt/unixlib.c @@ -121,14 +121,6 @@ static float CDECL unix_atanhf(float x) #endif } -/********************************************************************* - * ceilf - */ -static float CDECL unix_ceilf( float x ) -{ - return ceilf( x ); -} - /********************************************************************* * cos */ @@ -705,7 +697,6 @@ static const struct unix_funcs funcs = unix_asinhf, unix_atanh, unix_atanhf, - unix_ceilf, unix_cos, unix_cosf, unix_cosh, diff --git a/dlls/msvcrt/unixlib.h b/dlls/msvcrt/unixlib.h index 70d955d5e4f..472eb323850 100644 --- a/dlls/msvcrt/unixlib.h +++ b/dlls/msvcrt/unixlib.h @@ -29,7 +29,6 @@ struct unix_funcs float (CDECL *asinhf)(float x); double (CDECL *atanh)(double x); float (CDECL *atanhf)(float x); - float (CDECL *ceilf)(float x); double (CDECL *cos)(double x); float (CDECL *cosf)(float x); double (CDECL *cosh)(double x);

1 0

Piotr Caban : msvcrt: Import floorf implementation from musl.
by Alexandre Julliard 17 May '21

17 May '21

Module: wine Branch: master Commit: e5ddf0e8d8d5cf0021a1b210f6902f1285f54378 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e5ddf0e8d8d5cf0021a1b210… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon May 17 15:38:12 2021 +0200 msvcrt: Import floorf implementation from musl. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 23 ++++++++++++++++++++++- dlls/msvcrt/unixlib.c | 9 --------- dlls/msvcrt/unixlib.h | 1 - 3 files changed, 22 insertions(+), 11 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 5502e2934e9..d85b43c7d7f 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -827,10 +827,31 @@ float CDECL ceilf( float x ) /********************************************************************* * floorf (MSVCRT.@) + * + * Copied from musl: src/math/floorf.c */ float CDECL floorf( float x ) { - return unix_funcs->floorf(x); + union {float f; UINT32 i;} u = {x}; + int e = (int)(u.i >> 23 & 0xff) - 0x7f; + UINT32 m; + + if (e >= 23) + return x; + if (e >= 0) { + m = 0x007fffff >> e; + if ((u.i & m) == 0) + return x; + if (u.i >> 31) + u.i += m; + u.i &= ~m; + } else { + if (u.i >> 31 == 0) + return 0; + else if (u.i << 1) + return -1; + } + return u.f; } /********************************************************************* diff --git a/dlls/msvcrt/unixlib.c b/dlls/msvcrt/unixlib.c index 634ab6f1a4b..9cdcd14e986 100644 --- a/dlls/msvcrt/unixlib.c +++ b/dlls/msvcrt/unixlib.c @@ -281,14 +281,6 @@ static double CDECL unix_floor( double x ) return floor( x ); } -/********************************************************************* - * floorf - */ -static float CDECL unix_floorf( float x ) -{ - return floorf( x ); -} - /********************************************************************* * fma */ @@ -712,7 +704,6 @@ static const struct unix_funcs funcs = unix_expm1, unix_expm1f, unix_floor, - unix_floorf, unix_fma, unix_fmaf, unix_fmod, diff --git a/dlls/msvcrt/unixlib.h b/dlls/msvcrt/unixlib.h index 472eb323850..47af0e464cd 100644 --- a/dlls/msvcrt/unixlib.h +++ b/dlls/msvcrt/unixlib.h @@ -44,7 +44,6 @@ struct unix_funcs double (CDECL *expm1)(double x); float (CDECL *expm1f)(float x); double (CDECL *floor)(double x); - float (CDECL *floorf)(float x); double (CDECL *fma)(double x, double y, double z); float (CDECL *fmaf)(float x, float y, float z); double (CDECL *fmod)(double x, double y);

1 0

Piotr Caban : msvcrt: Import floor implementation from musl.
by Alexandre Julliard 17 May '21

17 May '21

Module: wine Branch: master Commit: 29c07324c19bbdaf5255b230cca5e0db5c5796c4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=29c07324c19bbdaf5255b230… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon May 17 15:38:15 2021 +0200 msvcrt: Import floor implementation from musl. The implementation is based on floorf. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 23 ++++++++++++++++++++++- dlls/msvcrt/unixlib.c | 9 --------- dlls/msvcrt/unixlib.h | 1 - 3 files changed, 22 insertions(+), 11 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index d85b43c7d7f..5682b00bb66 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -1811,10 +1811,31 @@ double CDECL ceil( double x ) /********************************************************************* * floor (MSVCRT.@) + * + * Based on musl: src/math/floorf.c */ double CDECL floor( double x ) { - return unix_funcs->floor(x); + union {double f; UINT64 i;} u = {x}; + int e = (int)(u.i >> 52 & 0x7ff) - 0x3ff; + UINT64 m; + + if (e >= 52) + return x; + if (e >= 0) { + m = 0x000fffffffffffffULL >> e; + if ((u.i & m) == 0) + return x; + if (u.i >> 63) + u.i += m; + u.i &= ~m; + } else { + if (u.i >> 63 == 0) + return 0; + else if (u.i << 1) + return -1; + } + return u.f; } /********************************************************************* diff --git a/dlls/msvcrt/unixlib.c b/dlls/msvcrt/unixlib.c index 9cdcd14e986..83a1e5386c1 100644 --- a/dlls/msvcrt/unixlib.c +++ b/dlls/msvcrt/unixlib.c @@ -273,14 +273,6 @@ static float CDECL unix_expm1f(float x) #endif } -/********************************************************************* - * floor - */ -static double CDECL unix_floor( double x ) -{ - return floor( x ); -} - /********************************************************************* * fma */ @@ -703,7 +695,6 @@ static const struct unix_funcs funcs = unix_exp2f, unix_expm1, unix_expm1f, - unix_floor, unix_fma, unix_fmaf, unix_fmod, diff --git a/dlls/msvcrt/unixlib.h b/dlls/msvcrt/unixlib.h index 47af0e464cd..a86e2d34852 100644 --- a/dlls/msvcrt/unixlib.h +++ b/dlls/msvcrt/unixlib.h @@ -43,7 +43,6 @@ struct unix_funcs float (CDECL *exp2f)(float x); double (CDECL *expm1)(double x); float (CDECL *expm1f)(float x); - double (CDECL *floor)(double x); double (CDECL *fma)(double x, double y, double z); float (CDECL *fmaf)(float x, float y, float z); double (CDECL *fmod)(double x, double y);

1 0

Haoyang Chen : gdiplus: Avoid filtering of special characters.
by Alexandre Julliard 17 May '21

17 May '21

Module: wine Branch: master Commit: 43e2563f449372a0f7ff72052bda56505f0c4359 URL: https://source.winehq.org/git/wine.git/?a=commit;h=43e2563f449372a0f7ff7205… Author: Haoyang Chen <chenhaoyang(a)uniontech.com> Date: Wed May 12 17:30:06 2021 +0800 gdiplus: Avoid filtering of special characters. Symbols such as ← should also be displayed. Signed-off-by: Haoyang Chen <chenhaoyang(a)uniontech.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/graphics.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index df4a89e8294..4a428c49869 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -5229,9 +5229,6 @@ GpStatus gdip_format_string(HDC hdc, hotkeyprefix_count = 0; for(i = 0, j = 0; i < length; i++){ - /* FIXME: This makes the indexes passed to callback inaccurate. */ - if(!iswprint(string[i]) && (string[i] != '\n')) - continue; /* FIXME: tabs should be handled using tabstops from stringformat */ if (string[i] == '\t')

1 0

Francois Gouget : winevulkan: Fix the spelling of a make_vulkan comment.
by Alexandre Julliard 17 May '21

17 May '21

Module: wine Branch: master Commit: a76fd1c312bfdff33774e361660f7fd29041099f URL: https://source.winehq.org/git/wine.git/?a=commit;h=a76fd1c312bfdff33774e361… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat May 15 17:31:57 2021 +0200 winevulkan: Fix the spelling of a make_vulkan comment. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index cc79b0a58cd..135fd5cf06a 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -1720,7 +1720,7 @@ class VkParam(object): def needs_unwrapping(self): """ Returns if parameter needs unwrapping of handle. """ - # Wrapped handle parameters are handled seperately, only look for wrapped handles in structs + # Wrapped handle parameters are handled separately, only look for wrapped handles in structs if self.is_struct(): return self.struct.needs_unwrapping()

1 0

Francois Gouget : advapi32/tests: Trace GetLastError() when an event log API fails.
by Alexandre Julliard 17 May '21

17 May '21

Module: wine Branch: master Commit: 59588b66cea635f696f65a45937dc1f8a142373f URL: https://source.winehq.org/git/wine.git/?a=commit;h=59588b66cea635f696f65a45… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sat May 15 17:38:47 2021 +0200 advapi32/tests: Trace GetLastError() when an event log API fails. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/eventlog.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/advapi32/tests/eventlog.c b/dlls/advapi32/tests/eventlog.c index 6722ea7d622..72bcb4d1788 100644 --- a/dlls/advapi32/tests/eventlog.c +++ b/dlls/advapi32/tests/eventlog.c @@ -113,9 +113,9 @@ static void test_open_close(void) /* This one opens the Application log */ handle = OpenEventLogA(NULL, "deadbeef"); - ok(handle != NULL, "Expected a handle\n"); + ok(handle != NULL, "Expected a handle : %d\n", GetLastError()); ret = CloseEventLog(handle); - ok(ret, "Expected success\n"); + ok(ret, "Expected success : %d\n", GetLastError()); /* Close a second time */ SetLastError(0xdeadbeef); ret = CloseEventLog(handle); @@ -127,11 +127,11 @@ static void test_open_close(void) /* Empty servername should be read as local server */ handle = OpenEventLogA("", "Application"); - ok(handle != NULL, "Expected a handle\n"); + ok(handle != NULL, "Expected a handle : %d\n", GetLastError()); CloseEventLog(handle); handle = OpenEventLogA(NULL, "Application"); - ok(handle != NULL, "Expected a handle\n"); + ok(handle != NULL, "Expected a handle : %d\n", GetLastError()); CloseEventLog(handle); } @@ -189,7 +189,7 @@ static void test_info(void) efi->dwFull = 0xdeadbeef; needed = sizeof(buffer); ret = pGetEventLogInformation(handle, EVENTLOG_FULL_INFO, efi, needed, &needed); - ok(ret, "Expected success\n"); + ok(ret, "Expected success : %d\n", GetLastError()); ok(needed == sizeof(EVENTLOG_FULL_INFORMATION), "Expected sizeof(EVENTLOG_FULL_INFORMATION), got %d\n", needed); ok(efi->dwFull == 0 || efi->dwFull == 1, "Expected 0 (not full) or 1 (full), got %d\n", efi->dwFull); @@ -224,7 +224,7 @@ static void test_count(void) count = 0xdeadbeef; ret = GetNumberOfEventLogRecords(handle, &count); - ok(ret, "Expected success\n"); + ok(ret, "Expected success : %d\n", GetLastError()); ok(count != 0xdeadbeef, "Expected the number of records\n"); CloseEventLog(handle); @@ -241,7 +241,7 @@ static void test_count(void) ret = GetNumberOfEventLogRecords(handle, &count); todo_wine { - ok(ret, "Expected success\n"); + ok(ret, "Expected success : %d\n", GetLastError()); ok(count != 0xdeadbeef, "Expected the number of records\n"); } @@ -278,7 +278,7 @@ static void test_oldest(void) oldest = 0xdeadbeef; ret = GetOldestEventLogRecord(handle, &oldest); - ok(ret, "Expected success\n"); + ok(ret, "Expected success : %d\n", GetLastError()); ok(oldest != 0xdeadbeef, "Expected the number of the oldest record\n"); CloseEventLog(handle); @@ -295,7 +295,7 @@ static void test_oldest(void) ret = GetOldestEventLogRecord(handle, &oldest); todo_wine { - ok(ret, "Expected success\n"); + ok(ret, "Expected success : %d\n", GetLastError()); ok(oldest != 0xdeadbeef, "Expected the number of the oldest record\n"); } @@ -335,7 +335,7 @@ static void test_backup(void) CloseEventLog(handle); return; } - ok(ret, "Expected success\n"); + ok(ret, "Expected success : %d\n", GetLastError()); todo_wine ok(GetFileAttributesA(backup) != INVALID_FILE_ATTRIBUTES, "Expected a backup file\n"); @@ -358,7 +358,7 @@ static void test_backup(void) ret = BackupEventLogA(handle, backup2); todo_wine { - ok(ret, "Expected success\n"); + ok(ret, "Expected success : %d\n", GetLastError()); ok(GetFileAttributesA(backup2) != INVALID_FILE_ATTRIBUTES, "Expected a backup file\n"); } @@ -505,7 +505,7 @@ static void test_read(void) read = needed = 0xdeadbeef; SetLastError(0xdeadbeef); ret = ReadEventLogA(handle, EVENTLOG_SEQUENTIAL_READ | EVENTLOG_FORWARDS_READ, 0, buf, toread, &read, &needed); - ok(ret, "Expected success\n"); + ok(ret, "Expected success : %d\n", GetLastError()); ok(read == toread || broken(read < toread), /* NT4 wants a buffer size way bigger than just 1 record */ "Expected the requested size to be read\n"); @@ -886,7 +886,7 @@ static void test_readwrite(void) handle = OpenEventLogA(NULL, eventlogname); count = 0xdeadbeef; ret = GetNumberOfEventLogRecords(handle, &count); - ok(ret, "Expected success\n"); + ok(ret, "Expected success : %d\n", GetLastError()); todo_wine ok(count == i, "Expected %d records, got %d\n", i, count); CloseEventLog(handle); @@ -1024,11 +1024,11 @@ static void test_readwrite(void) SetLastError(0xdeadbeef); ret = ClearEventLogA(handle, NULL); - ok(ret, "Expected success\n"); + ok(ret, "Expected success : %d\n", GetLastError()); count = 0xdeadbeef; ret = GetNumberOfEventLogRecords(handle, &count); - ok(ret, "Expected success\n"); + ok(ret, "Expected success : %d\n", GetLastError()); ok(count == 0, "Expected an empty eventlog, got %d records\n", count); CloseEventLog(handle);

1 0