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

Zhiyi Zhang : winedump: Dump the distance array for EMR_EXTTEXTOUTW records.
by Alexandre Julliard 17 May '21

17 May '21

Module: wine Branch: master Commit: e7de8395132a4f27e4ede3dc6112ccd426283ad4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e7de8395132a4f27e4ede3dc… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon May 17 17:09:27 2021 +0800 winedump: Dump the distance array for EMR_EXTTEXTOUTW records. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winedump/emf.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/tools/winedump/emf.c b/tools/winedump/emf.c index 2f54f73153b..50c3ad092ea 100644 --- a/tools/winedump/emf.c +++ b/tools/winedump/emf.c @@ -378,6 +378,7 @@ static int dump_emfrecord(void) case EMR_EXTTEXTOUTW: { const EMREXTTEXTOUTW *etoW = PRD(offset, sizeof(*etoW)); + const int *dx = (const int *)((const BYTE *)etoW + etoW->emrtext.offDx); printf("%-20s %08x\n", "EMR_EXTTEXTOUTW", length); printf("bounds (%d,%d - %d,%d) mode %#x x_scale %f y_scale %f pt (%d,%d) rect (%d,%d - %d,%d) flags %#x, %s\n", @@ -388,6 +389,14 @@ static int dump_emfrecord(void) etoW->emrtext.rcl.right, etoW->emrtext.rcl.bottom, etoW->emrtext.fOptions, debugstr_wn((LPCWSTR)((const BYTE *)etoW + etoW->emrtext.offString), etoW->emrtext.nChars)); + printf("dx_offset %u {", etoW->emrtext.offDx); + for (i = 0; i < etoW->emrtext.nChars; ++i) + { + printf("%d", dx[i]); + if (i != etoW->emrtext.nChars - 1) + putchar(','); + } + printf("}\n"); break; }

1 0

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

17 May '21

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 17 May '21

17 May '21

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

Nikolay Sivov : mfmediaengine: Keep device manager reference.
by Alexandre Julliard 17 May '21

17 May '21

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

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

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

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

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

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