wine-commits May 2021

wine-commits@winehq.org

2 participants
770 discussions

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 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 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

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

Hans Leidekker : webservices: Create the connection in WsOpenChannel.
by Alexandre Julliard 17 May '21

17 May '21

Module: wine Branch: master Commit: ea92c9c0ceee2d15b69e0c143a2a49efdbc42b2c URL: https://source.winehq.org/git/wine.git/?a=commit;h=ea92c9c0ceee2d15b69e0c14… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon May 17 15:36:14 2021 +0200 webservices: Create the connection in WsOpenChannel. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/channel.c | 187 ++++++++++++++++++++++++++++----------------- 1 file changed, 117 insertions(+), 70 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ea92c9c0ceee2d15b69e…

1 0

Hans Leidekker : webservices/tests: Wait for the listener to be ready.
by Alexandre Julliard 17 May '21

17 May '21

Module: wine Branch: master Commit: 4d0540fcf23a3888c1b7d4bac015e423c72eb85a URL: https://source.winehq.org/git/wine.git/?a=commit;h=4d0540fcf23a3888c1b7d4ba… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon May 17 15:36:13 2021 +0200 webservices/tests: Wait for the listener to be ready. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/tests/channel.c | 36 +++++++++++++++++++++++++----------- 1 file changed, 25 insertions(+), 11 deletions(-) diff --git a/dlls/webservices/tests/channel.c b/dlls/webservices/tests/channel.c index 4f56b864271..f27b2a3337d 100644 --- a/dlls/webservices/tests/channel.c +++ b/dlls/webservices/tests/channel.c @@ -436,7 +436,8 @@ static void test_WsResetListener(void) struct listener_info { int port; - HANDLE wait; + HANDLE ready; + HANDLE done; WS_CHANNEL_BINDING binding; WS_CHANNEL_TYPE type; void (*server_func)( WS_CHANNEL * ); @@ -485,6 +486,9 @@ static void client_message_read_write( const struct listener_info *info ) 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 ); @@ -527,7 +531,7 @@ static void client_message_read_write( const struct listener_info *info ) hr = WsWriteMessageEnd( channel, msg, NULL, NULL ); ok( hr == S_OK, "got %08x\n", hr ); - err = WaitForSingleObject( info->wait, 3000 ); + err = WaitForSingleObject( info->done, 3000 ); ok( err == WAIT_OBJECT_0, "wait failed %u\n", err ); hr = WsCloseChannel( channel, NULL, NULL ); @@ -623,6 +627,9 @@ static void client_duplex_session( const struct listener_info *info ) 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 ); @@ -654,7 +661,7 @@ static void client_duplex_session( const struct listener_info *info ) hr = WsSendMessage( channel, msg2, &desc, WS_WRITE_REQUIRED_VALUE, &val, sizeof(val), NULL, NULL ); ok( hr == S_OK, "got %08x\n", hr ); - err = WaitForSingleObject( info->wait, 3000 ); + err = WaitForSingleObject( info->done, 3000 ); ok( err == WAIT_OBJECT_0, "wait failed %u\n", err ); hr = WsShutdownSessionChannel( channel, NULL, NULL ); @@ -715,6 +722,9 @@ static void client_accept_channel( const struct listener_info *info ) HRESULT hr; DWORD err; + err = WaitForSingleObject( info->ready, 3000 ); + ok( err == WAIT_OBJECT_0, "wait failed %u\n", err ); + hr = WsAcceptChannel( NULL, NULL, NULL, NULL ); ok( hr == E_INVALIDARG, "got %08x\n", hr ); @@ -755,7 +765,7 @@ static void client_accept_channel( const struct listener_info *info ) hr = WsSendMessage( channel, msg, &desc, WS_WRITE_REQUIRED_VALUE, &val, sizeof(val), NULL, NULL ); ok( hr == S_OK, "got %08x\n", hr ); - err = WaitForSingleObject( info->wait, 3000 ); + err = WaitForSingleObject( info->done, 3000 ); ok( err == WAIT_OBJECT_0, "wait failed %u\n", err ); hr = WsCloseChannel( channel, NULL, NULL ); @@ -817,6 +827,10 @@ static void client_request_reply( const struct listener_info *info ) WS_MESSAGE_DESCRIPTION req_desc, reply_desc; INT32 val_in = -1, val_out = 0; 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 ); @@ -851,6 +865,9 @@ static void client_request_reply( const struct listener_info *info ) &reply_desc, WS_READ_REQUIRED_VALUE, NULL, &val_out, sizeof(val_out), NULL, NULL ); ok( val_out == -1, "got %d\n", val_out ); + err = WaitForSingleObject( info->done, 3000 ); + ok( err == WAIT_OBJECT_0, "wait failed %u\n", err ); + hr = WsCloseChannel( channel, NULL, NULL ); ok( hr == S_OK, "got %08x\n", hr ); @@ -880,14 +897,14 @@ static DWORD CALLBACK listener_proc( void *arg ) hr = WsCreateChannelForListener( listener, NULL, 0, &channel, NULL ); ok( hr == S_OK, "got %08x\n", hr ); - SetEvent( info->wait ); + SetEvent( info->ready ); hr = WsAcceptChannel( listener, channel, NULL, NULL ); ok( hr == S_OK, "got %08x\n", hr ); info->server_func( channel ); - SetEvent( info->wait ); + SetEvent( info->done ); hr = WsCloseChannel( channel, NULL, NULL ); ok( hr == S_OK, "got %08x\n", hr ); @@ -902,12 +919,8 @@ static DWORD CALLBACK listener_proc( void *arg ) static HANDLE start_listener( struct listener_info *info ) { - DWORD err; HANDLE thread = CreateThread( NULL, 0, listener_proc, info, 0, NULL ); ok( thread != NULL, "failed to create listener thread %u\n", GetLastError() ); - - err = WaitForSingleObject( info->wait, 3000 ); - ok( err == WAIT_OBJECT_0, "failed to start listener %u\n", err ); return thread; } @@ -1077,7 +1090,8 @@ START_TEST(channel) test_WsResetListener(); info.port = 7533; - info.wait = CreateEventW( NULL, 0, 0, NULL ); + info.ready = CreateEventW( NULL, 0, 0, NULL ); + info.done = CreateEventW( NULL, 0, 0, NULL ); for (i = 0; i < ARRAY_SIZE(tests); i++) {

1 0

Hans Leidekker : webservices: Implement WsGetChannelProperty(WS_CHANNEL_PROPERTY_STATE).
by Alexandre Julliard 17 May '21

17 May '21

Module: wine Branch: master Commit: 64254a0a808bace4ca21e812964135234e3cb21b URL: https://source.winehq.org/git/wine.git/?a=commit;h=64254a0a808bace4ca21e812… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon May 17 15:36:12 2021 +0200 webservices: Implement WsGetChannelProperty(WS_CHANNEL_PROPERTY_STATE). Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/channel.c | 5 +++++ dlls/webservices/tests/channel.c | 11 +++++++++++ 2 files changed, 16 insertions(+) diff --git a/dlls/webservices/channel.c b/dlls/webservices/channel.c index fd7c8d6029d..8e902e5aed7 100644 --- a/dlls/webservices/channel.c +++ b/dlls/webservices/channel.c @@ -672,6 +672,11 @@ HRESULT WINAPI WsGetChannelProperty( WS_CHANNEL *handle, WS_CHANNEL_PROPERTY_ID else *(WS_ENCODING *)buf = channel->encoding; break; + case WS_CHANNEL_PROPERTY_STATE: + if (!buf || size != sizeof(channel->state)) hr = E_INVALIDARG; + else *(WS_CHANNEL_STATE *)buf = channel->state; + break; + default: hr = prop_get( channel->prop, channel->prop_count, id, buf, size ); } diff --git a/dlls/webservices/tests/channel.c b/dlls/webservices/tests/channel.c index d80f1f64cde..4f56b864271 100644 --- a/dlls/webservices/tests/channel.c +++ b/dlls/webservices/tests/channel.c @@ -117,6 +117,7 @@ static void test_WsOpenChannel(void) { HRESULT hr; WS_CHANNEL *channel; + WS_CHANNEL_STATE state; WS_ENDPOINT_ADDRESS addr; hr = WsCreateChannel( WS_CHANNEL_TYPE_REQUEST, WS_HTTP_CHANNEL_BINDING, NULL, 0, NULL, &channel, NULL ); @@ -141,12 +142,22 @@ static void test_WsOpenChannel(void) hr = WsOpenChannel( channel, &addr, 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 ); + hr = WsOpenChannel( channel, &addr, NULL, NULL ); ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); hr = WsCloseChannel( 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_CLOSED, "got %u\n", state ); + hr = WsCloseChannel( channel, NULL, NULL ); ok( hr == S_OK, "got %08x\n", hr );

1 0

Zebediah Figura : include: Print context information after the message type.
by Alexandre Julliard 17 May '21

17 May '21

Module: wine Branch: master Commit: 19c9969c79b1b36ec3bada9dda6fa44df17a9482 URL: https://source.winehq.org/git/wine.git/?a=commit;h=19c9969c79b1b36ec3bada9d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon May 17 13:04:40 2021 +0200 include: Print context information after the message type. This makes identifying the failures and other message types easier and more reliable. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/test.h | 37 +++++++++++++++++++------------------ 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/include/wine/test.h b/include/wine/test.h index f2aacaff592..8073071d262 100644 --- a/include/wine/test.h +++ b/include/wine/test.h @@ -300,26 +300,26 @@ const char *winetest_elapsed(void) return wine_dbg_sprintf( "%.3f", (now - winetest_start_time) / 1000.0); } -static void winetest_vprintf( const char *msg, __winetest_va_list args ) -{ - struct tls_data *data = get_tls_data(); - unsigned int i; - - printf( "%s:%d:%s ", data->current_file, data->current_line, winetest_elapsed() ); - for (i = 0; i < data->context_count; ++i) - printf( "%s: ", data->context[i] ); - vprintf( msg, args ); -} - static void __winetest_cdecl winetest_printf( const char *msg, ... ) __WINE_PRINTF_ATTR(1,2); static void __winetest_cdecl winetest_printf( const char *msg, ... ) { + struct tls_data *data = get_tls_data(); __winetest_va_list valist; + printf( "%s:%d:%s ", data->current_file, data->current_line, winetest_elapsed() ); __winetest_va_start( valist, msg ); - winetest_vprintf( msg, valist ); + vprintf( msg, valist ); __winetest_va_end( valist ); } +static void __winetest_cdecl winetest_print_context( const char *msgtype ) +{ + struct tls_data *data = get_tls_data(); + unsigned int i; + + winetest_printf( "%s", msgtype ); + for (i = 0; i < data->context_count; ++i) + printf( "%s: ", data->context[i] ); +} void winetest_subtest( const char* name ) { @@ -371,7 +371,7 @@ int winetest_vok( int condition, const char *msg, __winetest_va_list args ) { if (condition) { - winetest_printf( "Test succeeded inside todo block: " ); + winetest_print_context( "Test succeeded inside todo block: " ); vprintf(msg, args); InterlockedIncrement(&todo_failures); return 0; @@ -383,7 +383,7 @@ int winetest_vok( int condition, const char *msg, __winetest_va_list args ) { if (winetest_debug > 0) { - winetest_printf( "Test marked todo: " ); + winetest_print_context( "Test marked todo: " ); vprintf(msg, args); } InterlockedIncrement(&todo_successes); @@ -397,7 +397,7 @@ int winetest_vok( int condition, const char *msg, __winetest_va_list args ) { if (!condition) { - winetest_printf( "Test failed: " ); + winetest_print_context( "Test failed: " ); vprintf(msg, args); InterlockedIncrement(&failures); return 0; @@ -407,7 +407,7 @@ int winetest_vok( int condition, const char *msg, __winetest_va_list args ) if (winetest_report_success || (winetest_time && GetTickCount() >= winetest_last_time + 1000)) { - winetest_printf( "Test succeeded\n" ); + winetest_printf("Test succeeded\n"); } InterlockedIncrement(&successes); return 1; @@ -432,8 +432,9 @@ void __winetest_cdecl winetest_trace( const char *msg, ... ) return; if (winetest_add_line() < winetest_mute_threshold) { + winetest_print_context( "" ); __winetest_va_start(valist, msg); - winetest_vprintf( msg, valist ); + vprintf( msg, valist ); __winetest_va_end(valist); } else @@ -444,7 +445,7 @@ void winetest_vskip( const char *msg, __winetest_va_list args ) { if (winetest_add_line() < winetest_mute_threshold) { - winetest_printf( "Tests skipped: " ); + winetest_print_context( "Tests skipped: " ); vprintf(msg, args); InterlockedIncrement(&skipped); }

1 0

Nikolay Sivov : mfmediaengine: Initial implementation of TransferVideoFrame() for ID3D11Texture2D destination.
by Alexandre Julliard 17 May '21

17 May '21

Module: wine Branch: master Commit: 2d525783875372cfa5e35b5b80a82c45f0f3306e URL: https://source.winehq.org/git/wine.git/?a=commit;h=2d525783875372cfa5e35b5b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 17 12:26:51 2021 +0300 mfmediaengine: Initial implementation of TransferVideoFrame() for ID3D11Texture2D destination. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfmediaengine/Makefile.in | 2 +- dlls/mfmediaengine/main.c | 535 ++++++++++++++++++++++++++++++++++++++++- 2 files changed, 531 insertions(+), 6 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2d525783875372cfa5e3…

1 0

Nikolay Sivov : mfmediaengine: Explicitly store output video format.
by Alexandre Julliard 17 May '21

17 May '21

Module: wine Branch: master Commit: d6eb5947e1a1d2219466298c17d285637979d9b8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d6eb5947e1a1d2219466298c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 17 12:26:50 2021 +0300 mfmediaengine: Explicitly store output video format. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfmediaengine/main.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/mfmediaengine/main.c b/dlls/mfmediaengine/main.c index 489cb2cdc6a..086886ab255 100644 --- a/dlls/mfmediaengine/main.c +++ b/dlls/mfmediaengine/main.c @@ -117,6 +117,7 @@ struct media_engine TOPOID node_id; BYTE *buffer; UINT buffer_size; + DXGI_FORMAT output_format; } video_frame; CRITICAL_SECTION cs; }; @@ -747,6 +748,8 @@ static HRESULT media_engine_create_video_renderer(struct media_engine *engine, I IMFActivate_Release(activate); + engine->video_frame.output_format = output_format; + return hr; }

1 0

← Newer
1
...
37
38
39
40
41
42
43
...
77
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 May 2021