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

Nikolay Sivov : mfmediaengine: Keep device manager reference.
by Alexandre Julliard May 17, 2021

May 17, 2021

Module: wine Branch: master Commit: b20c478bfd1322cf658105ce5695f5447288799f URL: https://source.winehq.org/git/wine.git/?a=commit;h=b20c478bfd1322cf658105ce… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 17 12:26:49 2021 +0300 mfmediaengine: Keep device manager reference. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfmediaengine/main.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/mfmediaengine/main.c b/dlls/mfmediaengine/main.c index 0678768cf08..489cb2cdc6a 100644 --- a/dlls/mfmediaengine/main.c +++ b/dlls/mfmediaengine/main.c @@ -93,6 +93,8 @@ struct media_engine LONG refcount; IMFMediaEngineNotify *callback; IMFAttributes *attributes; + IMFDXGIDeviceManager *device_manager; + HANDLE device_handle; enum media_engine_mode mode; unsigned int flags; double playback_rate; @@ -974,6 +976,11 @@ static void free_media_engine(struct media_engine *engine) IMFAttributes_Release(engine->attributes); if (engine->resolver) IMFSourceResolver_Release(engine->resolver); + if (engine->device_manager) + { + IMFDXGIDeviceManager_CloseDeviceHandle(engine->device_manager, engine->device_handle); + IMFDXGIDeviceManager_Release(engine->device_manager); + } SysFreeString(engine->current_source); DeleteCriticalSection(&engine->cs); free(engine->video_frame.buffer); @@ -1878,6 +1885,9 @@ static HRESULT init_media_engine(DWORD flags, IMFAttributes *attributes, struct if (FAILED(hr)) return hr; + IMFAttributes_GetUnknown(attributes, &MF_MEDIA_ENGINE_DXGI_MANAGER, &IID_IMFDXGIDeviceManager, + (void **)&engine->device_manager); + if (FAILED(hr = MFCreateMediaSession(NULL, &engine->session))) return hr;

1 0

Piotr Caban : msvcrt: Import floorf implementation from musl.
by Alexandre Julliard May 17, 2021

May 17, 2021

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 ceil implementation from musl.
by Alexandre Julliard May 17, 2021

May 17, 2021

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

Giovanni Mascellani : winegstreamer: Advertise support for thinned or reverse playback.
by Alexandre Julliard May 17, 2021

May 17, 2021

Module: wine Branch: master Commit: 02325ccb67ecee06823ca659ab11d8ab8864c9f9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=02325ccb67ecee06823ca659… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Mon May 17 10:13:08 2021 +0200 winegstreamer: Advertise support for thinned or reverse playback. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/media_source.c | 28 ++++++---------------------- 1 file changed, 6 insertions(+), 22 deletions(-) diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c index 8a87992d450..90efc9aaed2 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -933,13 +933,7 @@ static HRESULT WINAPI media_source_rate_support_GetSlowestRate(IMFRateSupport *i { TRACE("%p, %d, %d, %p.\n", iface, direction, thin, rate); - if (direction == MFRATE_REVERSE) - return MF_E_REVERSE_UNSUPPORTED; - - if (thin) - return MF_E_THINNING_UNSUPPORTED; - - *rate = 1.0f; + *rate = direction == MFRATE_FORWARD ? 1.0f : -1.0f; return S_OK; } @@ -948,31 +942,21 @@ static HRESULT WINAPI media_source_rate_support_GetFastestRate(IMFRateSupport *i { TRACE("%p, %d, %d, %p.\n", iface, direction, thin, rate); - if (direction == MFRATE_REVERSE) - return MF_E_REVERSE_UNSUPPORTED; - - if (thin) - return MF_E_THINNING_UNSUPPORTED; - - *rate = 1.0f; + *rate = direction == MFRATE_FORWARD ? 1.0f : -1.0f; return S_OK; } static HRESULT WINAPI media_source_rate_support_IsRateSupported(IMFRateSupport *iface, BOOL thin, float rate, float *nearest_support_rate) { - TRACE("%p, %d, %f, %p.\n", iface, thin, rate, nearest_support_rate); + const float supported_rate = rate >= 0.0f ? 1.0f : -1.0f; - if (rate < 0.0f) - return MF_E_REVERSE_UNSUPPORTED; - - if (thin) - return MF_E_THINNING_UNSUPPORTED; + TRACE("%p, %d, %f, %p.\n", iface, thin, rate, nearest_support_rate); if (nearest_support_rate) - *nearest_support_rate = 1.0f; + *nearest_support_rate = supported_rate; - return rate == 1.0f ? S_OK : MF_E_UNSUPPORTED_RATE; + return rate == supported_rate ? S_OK : MF_E_UNSUPPORTED_RATE; } static const IMFRateSupportVtbl media_source_rate_support_vtbl =

1 0

Nikolay Sivov : include: Add missing prototypes to mfapi.h.
by Alexandre Julliard May 17, 2021

May 17, 2021

Module: wine Branch: master Commit: 79a71f969148bc370e34847ff16eff033ac7d1a7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=79a71f969148bc370e34847f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 17 12:26:00 2021 +0300 include: Add missing prototypes to mfapi.h. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/mfapi.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/mfapi.h b/include/mfapi.h index 2ac70793d7a..a3945bd3a7d 100644 --- a/include/mfapi.h +++ b/include/mfapi.h @@ -554,6 +554,7 @@ HRESULT WINAPI MFInitAttributesFromBlob(IMFAttributes *attributes, const UINT8 * HRESULT WINAPI MFInitMediaTypeFromWaveFormatEx(IMFMediaType *mediatype, const WAVEFORMATEX *format, UINT32 size); HRESULT WINAPI MFInvokeCallback(IMFAsyncResult *result); LONGLONG WINAPI MFllMulDiv(LONGLONG val, LONGLONG num, LONGLONG denom, LONGLONG factor); +HRESULT WINAPI MFLockDXGIDeviceManager(UINT *token, IMFDXGIDeviceManager **manager); HRESULT WINAPI MFLockPlatform(void); HRESULT WINAPI MFLockSharedWorkQueue(const WCHAR *name, LONG base_priority, DWORD *taskid, DWORD *queue); DXGI_FORMAT WINAPI MFMapDX9FormatToDXGIFormat(DWORD format); @@ -580,6 +581,7 @@ HRESULT WINAPI MFTRegisterLocalByCLSID(REFCLSID clsid, REFGUID category, LPCWSTR HRESULT WINAPI MFRemovePeriodicCallback(DWORD key); HRESULT WINAPI MFShutdown(void); HRESULT WINAPI MFStartup(ULONG version, DWORD flags); +HRESULT WINAPI MFUnlockDXGIDeviceManager(void); HRESULT WINAPI MFUnlockPlatform(void); HRESULT WINAPI MFUnlockWorkQueue(DWORD queue); HRESULT WINAPI MFUnregisterPlatformFromMMCSS(void);

1 0

Nikolay Sivov : mfmediaengine: Keep latest video frame buffer.
by Alexandre Julliard May 17, 2021

May 17, 2021

Module: wine Branch: master Commit: c7023042e109d7592433b61cb25ca0d3f77d048b URL: https://source.winehq.org/git/wine.git/?a=commit;h=c7023042e109d7592433b61c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 17 12:26:48 2021 +0300 mfmediaengine: Keep latest video frame buffer. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfmediaengine/main.c | 29 +++++++++++++++++++---------- 1 file changed, 19 insertions(+), 10 deletions(-) diff --git a/dlls/mfmediaengine/main.c b/dlls/mfmediaengine/main.c index c6c73b625f1..0678768cf08 100644 --- a/dlls/mfmediaengine/main.c +++ b/dlls/mfmediaengine/main.c @@ -84,14 +84,6 @@ enum media_engine_flags FLAGS_ENGINE_IS_ENDED = 0x4000, }; -struct video_frame -{ - LONGLONG pts; - SIZE size; - SIZE ratio; - TOPOID node_id; -}; - struct media_engine { IMFMediaEngine IMFMediaEngine_iface; @@ -115,7 +107,15 @@ struct media_engine IMFPresentationClock *clock; IMFSourceResolver *resolver; BSTR current_source; - struct video_frame video_frame; + struct + { + LONGLONG pts; + SIZE size; + SIZE ratio; + TOPOID node_id; + BYTE *buffer; + UINT buffer_size; + } video_frame; CRITICAL_SECTION cs; }; @@ -976,6 +976,7 @@ static void free_media_engine(struct media_engine *engine) IMFSourceResolver_Release(engine->resolver); SysFreeString(engine->current_source); DeleteCriticalSection(&engine->cs); + free(engine->video_frame.buffer); free(engine); } @@ -1781,7 +1782,7 @@ static HRESULT WINAPI media_engine_grabber_callback_OnSetPresentationClock(IMFSa static HRESULT WINAPI media_engine_grabber_callback_OnProcessSample(IMFSampleGrabberSinkCallback *iface, REFGUID major_type, DWORD sample_flags, LONGLONG sample_time, LONGLONG sample_duration, - const BYTE *buffer, DWORD sample_size) + const BYTE *buffer, DWORD buffer_size) { struct media_engine *engine = impl_from_IMFSampleGrabberSinkCallback(iface); @@ -1793,6 +1794,14 @@ static HRESULT WINAPI media_engine_grabber_callback_OnProcessSample(IMFSampleGra media_engine_set_flag(engine, FLAGS_ENGINE_FIRST_FRAME, TRUE); } engine->video_frame.pts = sample_time; + if (engine->video_frame.buffer_size < buffer_size) + { + free(engine->video_frame.buffer); + if ((engine->video_frame.buffer = malloc(buffer_size))) + engine->video_frame.buffer_size = buffer_size; + } + if (engine->video_frame.buffer) + memcpy(engine->video_frame.buffer, buffer, buffer_size); LeaveCriticalSection(&engine->cs);

1 0

Hans Leidekker : webservices: Implement WsGetChannelProperty(WS_CHANNEL_PROPERTY_STATE).
by Alexandre Julliard May 17, 2021

May 17, 2021

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

Piotr Caban : msvcrt: Import cbrtf implementation from musl.
by Alexandre Julliard May 17, 2021

May 17, 2021

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 May 17, 2021

May 17, 2021

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 May 17, 2021

May 17, 2021

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