January 2022 - Wine-Commits

Alexandre Julliard : include: Add casts to avoid printf format warnings with 'long' types.
by Alexandre Julliard Jan. 27, 2022

Jan. 27, 2022

Module: wine Branch: master Commit: c8c96e89704829828e05667366b5f446b874e788 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c8c96e89704829828e056673… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 27 17:53:39 2022 +0100 include: Add casts to avoid printf format warnings with 'long' types. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/test.h | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/include/wine/test.h b/include/wine/test.h index 8073071d262..599234b3519 100644 --- a/include/wine/test.h +++ b/include/wine/test.h @@ -545,7 +545,7 @@ void winetest_wait_child_process( HANDLE process ) winetest_ok( 0, "Timed out waiting for the child process\n" ); else if (ret != WAIT_OBJECT_0) winetest_ok( 0, "Could not wait for the child process: %d le=%u\n", - ret, GetLastError() ); + (UINT)ret, (UINT)GetLastError() ); else { DWORD exit_code; @@ -553,12 +553,12 @@ void winetest_wait_child_process( HANDLE process ) if (exit_code > 255) { DWORD pid = GetProcessId( process ); - winetest_printf( "unhandled exception %08x in child process %04x\n", exit_code, pid ); + winetest_printf( "unhandled exception %08x in child process %04x\n", (UINT)exit_code, (UINT)pid ); InterlockedIncrement( &failures ); } else if (exit_code) { - winetest_printf( "%u failures in child process\n", exit_code ); + winetest_printf( "%u failures in child process\n", (UINT)exit_code ); while (exit_code-- > 0) InterlockedIncrement(&failures); } @@ -615,14 +615,14 @@ static int run_test( const char *name ) { if (muted_todo_successes || muted_skipped || muted_traces) printf( "%04x:%s:%s Silenced %d todos, %d skips and %d traces.\n", - GetCurrentProcessId(), test->name, winetest_elapsed(), - muted_todo_successes, muted_skipped, muted_traces); + (UINT)GetCurrentProcessId(), test->name, winetest_elapsed(), + (UINT)muted_todo_successes, (UINT)muted_skipped, (UINT)muted_traces); printf( "%04x:%s:%s %d tests executed (%d marked as todo, %d %s), %d skipped.\n", - GetCurrentProcessId(), test->name, winetest_elapsed(), - successes + failures + todo_successes + todo_failures, - todo_successes, failures + todo_failures, + (UINT)GetCurrentProcessId(), test->name, winetest_elapsed(), + (UINT)(successes + failures + todo_successes + todo_failures), + (UINT)todo_successes, (UINT)(failures + todo_failures), (failures + todo_failures != 1) ? "failures" : "failure", - skipped ); + (UINT)skipped ); } status = (failures + todo_failures < 255) ? failures + todo_failures : 255; return status; @@ -646,8 +646,8 @@ static LONG CALLBACK exc_filter( EXCEPTION_POINTERS *ptrs ) printf( "%s:%d: this is the last test seen before the exception\n", data->current_file, data->current_line ); printf( "%04x:%s:%s unhandled exception %08x at %p\n", - GetCurrentProcessId(), current_test->name, winetest_elapsed(), - ptrs->ExceptionRecord->ExceptionCode, ptrs->ExceptionRecord->ExceptionAddress ); + (UINT)GetCurrentProcessId(), current_test->name, winetest_elapsed(), + (UINT)ptrs->ExceptionRecord->ExceptionCode, ptrs->ExceptionRecord->ExceptionAddress ); fflush( stdout ); return EXCEPTION_EXECUTE_HANDLER; }

1 0

Connor McAdams : secur32: Switch back to non-blocking mode for DTLS sessions.
by Alexandre Julliard Jan. 27, 2022

Jan. 27, 2022

Module: wine Branch: master Commit: 387a30a8ce86d782d194ea1ec63dc0b41db9cf8b URL: https://source.winehq.org/git/wine.git/?a=commit;h=387a30a8ce86d782d194ea1e… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Thu Jan 27 11:11:29 2022 +0100 secur32: Switch back to non-blocking mode for DTLS sessions. In order for DTLS retransmission to occur properly, we need to be in non-blocking mode. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/schannel_gnutls.c | 7 +++---- dlls/secur32/tests/schannel.c | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/secur32/schannel_gnutls.c b/dlls/secur32/schannel_gnutls.c index ac51cbb5d9f..3f947870a73 100644 --- a/dlls/secur32/schannel_gnutls.c +++ b/dlls/secur32/schannel_gnutls.c @@ -461,14 +461,13 @@ static NTSTATUS schan_get_enabled_protocols( void *args ) static int pull_timeout(gnutls_transport_ptr_t transport, unsigned int timeout) { struct schan_transport *t = (struct schan_transport*)transport; - gnutls_session_t s = (gnutls_session_t)t->session; SIZE_T count = 0; TRACE("\n"); if (get_buffer(t, &t->in, &count)) return 1; - pgnutls_transport_set_errno(s, EAGAIN); - return -1; + + return 0; } static NTSTATUS schan_create_session( void *args ) @@ -483,7 +482,7 @@ static NTSTATUS schan_create_session( void *args ) if (cred->enabled_protocols & (SP_PROT_DTLS1_0_CLIENT | SP_PROT_DTLS1_2_CLIENT)) { - flags |= GNUTLS_DATAGRAM; + flags |= GNUTLS_DATAGRAM | GNUTLS_NONBLOCK; } err = pgnutls_init(s, flags); diff --git a/dlls/secur32/tests/schannel.c b/dlls/secur32/tests/schannel.c index afcc382927a..902a490a296 100644 --- a/dlls/secur32/tests/schannel.c +++ b/dlls/secur32/tests/schannel.c @@ -1706,7 +1706,7 @@ static void test_dtls(void) ok( ctx_handle.dwUpper == ctx_handle2.dwUpper, "dwUpper mismatch, expected %#lx, got %#lx\n", ctx_handle.dwUpper, ctx_handle2.dwUpper); /* With no new input buffer, output buffer length should match prior call. */ - todo_wine ok(buffers[1].pBuffers[0].cbBuffer == prev_buf_len, "Output buffer size mismatch, expected %#x, got %#x\n", + ok(buffers[1].pBuffers[0].cbBuffer == prev_buf_len, "Output buffer size mismatch, expected %#x, got %#x\n", prev_buf_len, buffers[1].pBuffers[0].cbBuffer); free_buffers( &buffers[0] );

1 0

Connor McAdams : secur32: Clear SECBUFFER_ALERT output buffer count in schan_InitializeSecurityContextW.
by Alexandre Julliard Jan. 27, 2022

Jan. 27, 2022

Module: wine Branch: master Commit: 795d3e2cb5ae320fdcb4dd1c23023a2d744ebbda URL: https://source.winehq.org/git/wine.git/?a=commit;h=795d3e2cb5ae320fdcb4dd1c… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Thu Jan 27 11:11:27 2022 +0100 secur32: Clear SECBUFFER_ALERT output buffer count in schan_InitializeSecurityContextW. Since we write no data into this buffer, set the count to 0. Otherwise, some applications assume there has been alert data written into the buffer. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/schannel.c | 6 ++++++ dlls/secur32/tests/schannel.c | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index f1b47a78d21..71993e1d2d6 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -894,6 +894,12 @@ static SECURITY_STATUS SEC_ENTRY schan_InitializeSecurityContextW( pInput->pBuffers[1].cbBuffer = pInput->pBuffers[0].cbBuffer-ctx->transport.in.offset; } + for (i = 0; i < pOutput->cBuffers; i++) + { + SecBuffer *buffer = &pOutput->pBuffers[i]; + if (buffer->BufferType == SECBUFFER_ALERT) buffer->cbBuffer = 0; + } + *pfContextAttr = ISC_RET_REPLAY_DETECT | ISC_RET_SEQUENCE_DETECT | ISC_RET_CONFIDENTIALITY | ISC_RET_STREAM; if (ctx->req_ctx_attr & ISC_REQ_EXTENDED_ERROR) *pfContextAttr |= ISC_RET_EXTENDED_ERROR; if (ctx->req_ctx_attr & ISC_REQ_DATAGRAM) *pfContextAttr |= ISC_RET_DATAGRAM; diff --git a/dlls/secur32/tests/schannel.c b/dlls/secur32/tests/schannel.c index 6c15addf2fc..6fbe0c34bd1 100644 --- a/dlls/secur32/tests/schannel.c +++ b/dlls/secur32/tests/schannel.c @@ -700,7 +700,7 @@ static void test_context_output_buffer_size(DWORD protocol, DWORD flags, ULONG c status = InitializeSecurityContextA(&cred_handle, NULL, (SEC_CHAR *)"localhost", ctxt_flags_req, 0, 0, &in_buffers, 0, &context, &out_buffers, &attrs, NULL); ok(status == SEC_I_CONTINUE_NEEDED, "%d: Expected SEC_I_CONTINUE_NEEDED, got %08x\n", i, status); - if (i) todo_wine ok(!buffer->cbBuffer, "Expected SECBUFFER_ALERT buffer to be empty\n"); + if (i) ok(!buffer->cbBuffer, "Expected SECBUFFER_ALERT buffer to be empty\n"); DeleteSecurityContext(&context); } @@ -1661,7 +1661,7 @@ static void test_dtls(void) ok( !exp.LowPart, "got %08x\n", exp.LowPart ); ok( !exp.HighPart, "got %08x\n", exp.HighPart ); ok( buffers[1].pBuffers[1].BufferType == SECBUFFER_ALERT, "Expected buffertype SECBUFFER_ALERT, got %#x\n", buffers[1].pBuffers[1].BufferType); - todo_wine ok( !buffers[1].pBuffers[1].cbBuffer, "Expected SECBUFFER_ALERT buffer to be empty, got %#x\n", buffers[1].pBuffers[1].cbBuffer); + ok( !buffers[1].pBuffers[1].cbBuffer, "Expected SECBUFFER_ALERT buffer to be empty, got %#x\n", buffers[1].pBuffers[1].cbBuffer); prev_buf_len = buffers[1].pBuffers[0].cbBuffer; /*

1 0

Rémi Bernon : mf/tests: Add some WMA decoder GetInputStreamInfo tests.
by Alexandre Julliard Jan. 27, 2022

Jan. 27, 2022

Module: wine Branch: master Commit: 5012bae4adfb1cf119962d04c11fc289715905ff URL: https://source.winehq.org/git/wine.git/?a=commit;h=5012bae4adfb1cf119962d04… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Jan 26 13:51:57 2022 +0100 mf/tests: Add some WMA decoder GetInputStreamInfo tests. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51931 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52391 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/tests/mf.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index f628a1116e4..a3041e64612 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -5727,6 +5727,7 @@ static void test_wma_decoder(void) MFT_REGISTER_TYPE_INFO input_type = {MFMediaType_Audio, MFAudioFormat_WMAudioV8}; MFT_REGISTER_TYPE_INFO output_type = {MFMediaType_Audio, MFAudioFormat_Float}; + MFT_INPUT_STREAM_INFO input_info; IMFMediaType *media_type; IMFTransform *transform; GUID class_id; @@ -5746,6 +5747,9 @@ static void test_wma_decoder(void) /* check default media types */ + hr = IMFTransform_GetInputStreamInfo(transform, 0, &input_info); + todo_wine + ok(hr == MF_E_TRANSFORM_TYPE_NOT_SET, "GetInputStreamInfo returned %#x\n", hr); hr = IMFTransform_GetOutputAvailableType(transform, 0, 0, &media_type); todo_wine ok(hr == MF_E_TRANSFORM_TYPE_NOT_SET, "GetOutputAvailableType returned %#x\n", hr); @@ -5803,6 +5807,10 @@ static void test_wma_decoder(void) ret = IMFMediaType_Release(media_type); ok(ret == 0, "Release returned %u\n", ret); + hr = IMFTransform_GetInputStreamInfo(transform, 0, &input_info); + todo_wine + ok(hr == MF_E_TRANSFORM_TYPE_NOT_SET, "GetInputStreamInfo returned %#x\n", hr); + /* check new output media types */ i = -1; @@ -5845,6 +5853,21 @@ static void test_wma_decoder(void) ret = IMFMediaType_Release(media_type); ok(ret == 0, "Release returned %u\n", ret); + memset(&input_info, 0xcd, sizeof(input_info)); + hr = IMFTransform_GetInputStreamInfo(transform, 0, &input_info); + todo_wine + ok(hr == S_OK, "GetInputStreamInfo returned %#x\n", hr); + todo_wine + ok(input_info.hnsMaxLatency == 0, "got hnsMaxLatency %s\n", wine_dbgstr_longlong(input_info.hnsMaxLatency)); + todo_wine + ok(input_info.dwFlags == 0, "got dwFlags %#x\n", input_info.dwFlags); + todo_wine + ok(input_info.cbSize == wma_block_size, "got cbSize %u\n", input_info.cbSize); + todo_wine + ok(input_info.cbMaxLookahead == 0, "got cbMaxLookahead %#x\n", input_info.cbMaxLookahead); + todo_wine + ok(input_info.cbAlignment == 1, "got cbAlignment %#x\n", input_info.cbAlignment); + ret = IMFTransform_Release(transform); ok(ret == 0, "Release returned %u\n", ret);

1 0

Alexandre Julliard : d3dx11: Fix printf format warnings on 64-bit.
by Alexandre Julliard Jan. 27, 2022

Jan. 27, 2022

Module: wine Branch: master Commit: 0e50a00ecb55d31f359bd7387826710660a2549a URL: https://source.winehq.org/git/wine.git/?a=commit;h=0e50a00ecb55d31f359bd738… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 27 17:55:15 2022 +0100 d3dx11: Fix printf format warnings on 64-bit. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx11_43/async.c | 4 ++-- dlls/d3dx11_43/main.c | 2 +- dlls/d3dx11_43/texture.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/d3dx11_43/async.c b/dlls/d3dx11_43/async.c index ee20602310a..8d947742b9d 100644 --- a/dlls/d3dx11_43/async.c +++ b/dlls/d3dx11_43/async.c @@ -219,7 +219,7 @@ HRESULT WINAPI D3DX11CompileFromMemory(const char *data, SIZE_T data_size, const const char *target, UINT sflags, UINT eflags, ID3DX11ThreadPump *pump, ID3D10Blob **shader, ID3D10Blob **error_messages, HRESULT *hresult) { - TRACE("data %s, data_size %lu, filename %s, defines %p, include %p, entry_point %s, target %s, " + TRACE("data %s, data_size %Iu, filename %s, defines %p, include %p, entry_point %s, target %s, " "sflags %#x, eflags %#x, pump %p, shader %p, error_messages %p, hresult %p.\n", debugstr_an(data, data_size), data_size, debugstr_a(filename), defines, include, debugstr_a(entry_point), debugstr_a(target), sflags, eflags, pump, shader, @@ -277,7 +277,7 @@ HRESULT WINAPI D3DX11CreateAsyncMemoryLoader(const void *data, SIZE_T data_size, { struct asyncdataloader *object; - TRACE("data %p, data_size %lu, loader %p.\n", data, data_size, loader); + TRACE("data %p, data_size %Iu, loader %p.\n", data, data_size, loader); if (!data || !loader) return E_FAIL; diff --git a/dlls/d3dx11_43/main.c b/dlls/d3dx11_43/main.c index 950f6d76f5c..5dad027864f 100644 --- a/dlls/d3dx11_43/main.c +++ b/dlls/d3dx11_43/main.c @@ -70,7 +70,7 @@ HRESULT WINAPI D3DX11GetImageInfoFromFileW(const WCHAR *filename, ID3DX11ThreadP HRESULT WINAPI D3DX11GetImageInfoFromMemory(const void *src_data, SIZE_T src_data_size, ID3DX11ThreadPump *pump, D3DX11_IMAGE_INFO *img_info, HRESULT *hresult) { - FIXME("src_data %p, src_data_size %lu, pump %p, img_info %p, hresult %p stub!\n", + FIXME("src_data %p, src_data_size %Iu, pump %p, img_info %p, hresult %p stub!\n", src_data, src_data_size, pump, img_info, hresult); return E_NOTIMPL; diff --git a/dlls/d3dx11_43/texture.c b/dlls/d3dx11_43/texture.c index ee6808d76d6..81ac8ee6db7 100644 --- a/dlls/d3dx11_43/texture.c +++ b/dlls/d3dx11_43/texture.c @@ -27,7 +27,7 @@ HRESULT WINAPI D3DX11CreateShaderResourceViewFromMemory(ID3D11Device *device, co SIZE_T data_size, D3DX11_IMAGE_LOAD_INFO *load_info, ID3DX11ThreadPump *pump, ID3D11ShaderResourceView **view, HRESULT *hresult) { - FIXME("device %p, data %p, data_size %lu, load_info %p, pump %p, view %p, hresult %p stub!\n", + FIXME("device %p, data %p, data_size %Iu, load_info %p, pump %p, view %p, hresult %p stub!\n", device, data, data_size, load_info, pump, view, hresult); return E_NOTIMPL; @@ -57,7 +57,7 @@ HRESULT WINAPI D3DX11CreateTextureFromMemory(ID3D11Device *device, const void *d SIZE_T data_size, D3DX11_IMAGE_LOAD_INFO *load_info, ID3DX11ThreadPump *pump, ID3D11Resource **texture, HRESULT *hresult) { - FIXME("device %p, data %p, data_size %lu, load_info %p, pump %p, texture %p, hresult %p stub.\n", + FIXME("device %p, data %p, data_size %Iu, load_info %p, pump %p, texture %p, hresult %p stub.\n", device, data, data_size, load_info, pump, texture, hresult); return E_NOTIMPL;

1 0

Alexandre Julliard : opencl: Fix printf format warnings on 64-bit.
by Alexandre Julliard Jan. 27, 2022

Jan. 27, 2022

Module: wine Branch: master Commit: 6d078f6852655a4833508a6618ba3dc844c9db06 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6d078f6852655a4833508a66… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 27 17:55:55 2022 +0100 opencl: Fix printf format warnings on 64-bit. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opencl/pe_wrappers.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/opencl/pe_wrappers.c b/dlls/opencl/pe_wrappers.c index 5fde6a8b852..158f255d4e6 100644 --- a/dlls/opencl/pe_wrappers.c +++ b/dlls/opencl/pe_wrappers.c @@ -85,7 +85,7 @@ cl_int WINAPI clGetPlatformInfo( cl_platform_id platform, cl_platform_info name, { cl_int ret; - TRACE( "(%p, %#x, %ld, %p, %p)\n", platform, name, size, value, ret_size ); + TRACE( "(%p, %#x, %Id, %p, %p)\n", platform, name, size, value, ret_size ); if (name == CL_PLATFORM_EXTENSIONS) { @@ -128,7 +128,7 @@ cl_int WINAPI clGetDeviceInfo( cl_device_id device, cl_device_info name, { cl_int ret; - TRACE( "(%p, %#x, %ld, %p, %p)\n", device, name, size, value, ret_size ); + TRACE( "(%p, %#x, %Id, %p, %p)\n", device, name, size, value, ret_size ); if (name == CL_DEVICE_EXTENSIONS) {

1 0

Paul Gofman : winhttp: Allow synchronous nonblocking send in socket_send_pong().
by Alexandre Julliard Jan. 27, 2022

Jan. 27, 2022

Module: wine Branch: master Commit: bb36da429f2c241af24b411db76530de87432df1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bb36da429f2c241af24b411d… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Jan 27 02:03:09 2022 +0300 winhttp: Allow synchronous nonblocking send in socket_send_pong(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/request.c | 37 ++++++++++++++++++++++++++++++------- 1 file changed, 30 insertions(+), 7 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 62f53995258..ff2c18c469b 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -3505,7 +3505,10 @@ static void CALLBACK task_socket_send_pong( TP_CALLBACK_INSTANCE *instance, void struct socket_send *s = ctx; TRACE("running %p\n", work); - send_frame( s->socket, SOCKET_OPCODE_PONG, 0, NULL, 0, TRUE, NULL ); + + if (s->complete_async) complete_send_frame( s->socket, &s->ovr, NULL ); + else send_frame( s->socket, SOCKET_OPCODE_PONG, 0, NULL, 0, TRUE, NULL ); + send_io_complete( &s->socket->hdr ); release_object( &s->socket->hdr ); @@ -3516,18 +3519,38 @@ static DWORD socket_send_pong( struct socket *socket ) { if (socket->request->connect->hdr.flags & WINHTTP_FLAG_ASYNC) { + BOOL async_send, complete_async = FALSE; struct socket_send *s; - DWORD ret; + DWORD ret = 0; if (!(s = malloc( sizeof(*s) ))) return ERROR_OUTOFMEMORY; - s->socket = socket; - addref_object( &socket->hdr ); - InterlockedIncrement( &socket->hdr.pending_sends ); - if ((ret = queue_task( &socket->send_q, task_socket_send_pong, s ))) + async_send = InterlockedIncrement( &socket->hdr.pending_sends ) > 1; + if (!async_send) + { + memset( &s->ovr, 0, sizeof(s->ovr) ); + if ((ret = send_frame( socket, SOCKET_OPCODE_PONG, 0, NULL, 0, TRUE, &s->ovr )) == WSA_IO_PENDING) + { + async_send = TRUE; + complete_async = TRUE; + } + } + + if (async_send) + { + s->complete_async = complete_async; + s->socket = socket; + addref_object( &socket->hdr ); + if ((ret = queue_task( &socket->send_q, task_socket_send_pong, s ))) + { + InterlockedDecrement( &socket->hdr.pending_sends ); + release_object( &socket->hdr ); + free( s ); + } + } + else { InterlockedDecrement( &socket->hdr.pending_sends ); - release_object( &socket->hdr ); free( s ); } return ret;

1 0

Connor McAdams : secur32/tests: Add tests for DTLS handshake retransmission.
by Alexandre Julliard Jan. 27, 2022

Jan. 27, 2022

Module: wine Branch: master Commit: 26f81bb883194d47747f71154d07aaad09a99d56 URL: https://source.winehq.org/git/wine.git/?a=commit;h=26f81bb883194d47747f7115… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Thu Jan 27 11:11:30 2022 +0100 secur32/tests: Add tests for DTLS handshake retransmission. Successive calls to InitializeSecurityContext without a new pInput buffer will result in retransmission, creating a handshake packet with an incremented sequence number value, but otherwise identical to the last call to InitializeSecurityContext. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/tests/schannel.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/dlls/secur32/tests/schannel.c b/dlls/secur32/tests/schannel.c index 902a490a296..abddfa138ab 100644 --- a/dlls/secur32/tests/schannel.c +++ b/dlls/secur32/tests/schannel.c @@ -1623,6 +1623,7 @@ static void test_dtls(void) CtxtHandle ctx_handle, ctx_handle2; SecBufferDesc buffers[3]; ULONG flags_req, flags_ret, attr, prev_buf_len; + char *buf, *buf2; init_cred( &cred ); cred.grbitEnabledProtocols = SP_PROT_DTLS_CLIENT | SP_PROT_DTLS1_2_CLIENT; @@ -1663,6 +1664,9 @@ static void test_dtls(void) ok( buffers[1].pBuffers[1].BufferType == SECBUFFER_ALERT, "Expected buffertype SECBUFFER_ALERT, got %#x\n", buffers[1].pBuffers[1].BufferType); ok( !buffers[1].pBuffers[1].cbBuffer, "Expected SECBUFFER_ALERT buffer to be empty, got %#x\n", buffers[1].pBuffers[1].cbBuffer); prev_buf_len = buffers[1].pBuffers[0].cbBuffer; + buf = HeapAlloc( GetProcessHeap(), 0, prev_buf_len ); + memcpy( buf, buffers[1].pBuffers[0].pvBuffer, prev_buf_len ); + ok( buf[10] == 0, "Expected initial packet to have sequence number value of 0, got %d\n", buf[10]); /* * If we don't set the SECBUFFER_ALERT cbBuffer value, we will get @@ -1709,7 +1713,17 @@ static void test_dtls(void) ok(buffers[1].pBuffers[0].cbBuffer == prev_buf_len, "Output buffer size mismatch, expected %#x, got %#x\n", prev_buf_len, buffers[1].pBuffers[0].cbBuffer); + /* + * The retransmission packet and the original packet should only differ in + * their sequence number value. + */ + buf2 = (char *)buffers[1].pBuffers[0].pvBuffer; + ok( buf2[10] == 1, "Expected retransmitted packet to have sequence number value of 1, got %d\n", buf2[10]); + ok( !memcmp(buf2, buf, 9), "Lower portion mismatch between retransmitted packet and original packet\n"); + ok( !memcmp(buf2 + 11, buf + 11, prev_buf_len - 11), "Upper portion mismatch between retransmitted packet and original packet\n"); + free_buffers( &buffers[0] ); + HeapFree(GetProcessHeap(), 0, buf); HeapFree(GetProcessHeap(), 0, buffers[1].pBuffers[1].pvBuffer); free_buffers( &buffers[1] ); DeleteSecurityContext( &ctx_handle );

1 0

Huw Davies : winecoreaudio: Remove unnecessary buffer sizes.
by Alexandre Julliard Jan. 27, 2022

Jan. 27, 2022

Module: wine Branch: master Commit: aa3df3f75ef7b27c64168f34df068412f2b849ca URL: https://source.winehq.org/git/wine.git/?a=commit;h=aa3df3f75ef7b27c64168f34… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jan 26 13:26:13 2022 +0000 winecoreaudio: Remove unnecessary buffer sizes. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winecoreaudio.drv/coreaudio.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/winecoreaudio.drv/coreaudio.c b/dlls/winecoreaudio.drv/coreaudio.c index a2bbc3e45c9..f242ebe54a8 100644 --- a/dlls/winecoreaudio.drv/coreaudio.c +++ b/dlls/winecoreaudio.drv/coreaudio.c @@ -92,7 +92,6 @@ struct coreaudio_stream INT32 getbuf_last; WAVEFORMATEX *fmt; BYTE *local_buffer, *cap_buffer, *wrap_buffer, *resamp_buffer, *tmp_buffer; - SIZE_T local_buffer_size, tmp_buffer_size; }; static HRESULT osstatus_to_hresult(OSStatus sc) @@ -617,6 +616,7 @@ static NTSTATUS create_stream(void *args) struct coreaudio_stream *stream = calloc(1, sizeof(*stream)); AURenderCallbackStruct input; OSStatus sc; + SIZE_T size; if(!stream){ params->result = E_OUTOFMEMORY; @@ -679,8 +679,8 @@ static NTSTATUS create_stream(void *args) goto end; } - stream->local_buffer_size = stream->bufsize_frames * stream->fmt->nBlockAlign; - if(NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&stream->local_buffer, 0, &stream->local_buffer_size, + size = stream->bufsize_frames * stream->fmt->nBlockAlign; + if(NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&stream->local_buffer, 0, &size, MEM_COMMIT, PAGE_READWRITE)){ params->result = E_OUTOFMEMORY; goto end; @@ -1337,6 +1337,7 @@ static NTSTATUS get_render_buffer(void *args) { struct get_render_buffer_params *params = args; struct coreaudio_stream *stream = params->stream; + SIZE_T size; UINT32 pad; OSSpinLockLock(&stream->lock); @@ -1359,14 +1360,14 @@ static NTSTATUS get_render_buffer(void *args) if(stream->wri_offs_frames + params->frames > stream->bufsize_frames){ if(stream->tmp_buffer_frames < params->frames){ if(stream->tmp_buffer){ - SIZE_T size = 0; + size = 0; NtFreeVirtualMemory(GetCurrentProcess(), (void **)&stream->tmp_buffer, &size, MEM_RELEASE); stream->tmp_buffer = NULL; } - stream->tmp_buffer_size = params->frames * stream->fmt->nBlockAlign; + size = params->frames * stream->fmt->nBlockAlign; if(NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&stream->tmp_buffer, 0, - &stream->tmp_buffer_size, MEM_COMMIT, PAGE_READWRITE)){ + &size, MEM_COMMIT, PAGE_READWRITE)){ stream->tmp_buffer_frames = 0; params->result = E_OUTOFMEMORY; goto end; @@ -1439,6 +1440,7 @@ static NTSTATUS get_capture_buffer(void *args) struct coreaudio_stream *stream = params->stream; UINT32 chunk_bytes, chunk_frames; LARGE_INTEGER stamp, freq; + SIZE_T size; OSSpinLockLock(&stream->lock); @@ -1461,9 +1463,9 @@ static NTSTATUS get_capture_buffer(void *args) if(chunk_frames < stream->period_frames){ chunk_bytes = chunk_frames * stream->fmt->nBlockAlign; if(!stream->tmp_buffer){ - stream->tmp_buffer_size = stream->period_frames * stream->fmt->nBlockAlign; + size = stream->period_frames * stream->fmt->nBlockAlign; NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&stream->tmp_buffer, 0, - &stream->tmp_buffer_size, MEM_COMMIT, PAGE_READWRITE); + &size, MEM_COMMIT, PAGE_READWRITE); } *params->data = stream->tmp_buffer; memcpy(*params->data, stream->local_buffer + stream->lcl_offs_frames * stream->fmt->nBlockAlign,

1 0

Alexandre Julliard : msvcp60/tests: Fix printf format warnings on 64-bit.
by Alexandre Julliard Jan. 27, 2022

Jan. 27, 2022

Module: wine Branch: master Commit: 88ba91de857322676fd59e79803ebf57c00c8c2b URL: https://source.winehq.org/git/wine.git/?a=commit;h=88ba91de857322676fd59e79… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 27 17:55:42 2022 +0100 msvcp60/tests: Fix printf format warnings on 64-bit. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp60/tests/ios.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msvcp60/tests/ios.c b/dlls/msvcp60/tests/ios.c index b4753f3ee51..e6b79edcd11 100644 --- a/dlls/msvcp60/tests/ios.c +++ b/dlls/msvcp60/tests/ios.c @@ -1424,7 +1424,7 @@ static void test_istream_tellg(void) call_func2_ptr_fpos(p_basic_istream_char_seekg_fpos, &ss.base.base1, spos); rpos = call_func2(p_basic_istream_char_tellg, &ss.base.base1, &tpos); - ok(tests[i].telloff_ss == tpos.off, "wrong offset, expected = %ld found = %ld\n", tests[i].telloff_ss, tpos.off); + ok(tests[i].telloff_ss == tpos.off, "wrong offset, expected = %Id found = %Id\n", tests[i].telloff_ss, tpos.off); ok(rpos == &tpos, "wrong return fpos, expected = %p found = %p\n", rpos, &tpos); ok(tpos.pos == 0, "wrong position, expected = 0 found = %s\n", wine_dbgstr_longlong(tpos.pos)); ok(tpos.state == 0, "wrong state, expected = 0 found = %d\n", tpos.state); @@ -1453,7 +1453,7 @@ static void test_istream_tellg(void) call_func2_ptr_fpos(p_basic_istream_wchar_seekg_fpos, &wss.base.base1, spos); rpos = call_func2(p_basic_istream_wchar_tellg, &wss.base.base1, &tpos); - ok(tests[i].telloff_ss == tpos.off, "wrong offset, expected = %ld found = %ld\n", tests[i].telloff_ss, tpos.off); + ok(tests[i].telloff_ss == tpos.off, "wrong offset, expected = %Id found = %Id\n", tests[i].telloff_ss, tpos.off); ok(rpos == &tpos, "wrong return fpos, expected = %p found = %p\n", rpos, &tpos); ok(tpos.pos == 0, "wrong position, expected = 0 found = %s\n", wine_dbgstr_longlong(tpos.pos)); ok(tpos.state == 0, "wrong state, expected = 0 found = %d\n", tpos.state); @@ -1488,7 +1488,7 @@ static void test_istream_tellg(void) ok(tests[i].tellpos == tpos.pos, "wrong filepos, expected = %s found = %s\n", wine_dbgstr_longlong(tests[i].tellpos), wine_dbgstr_longlong(tpos.pos)); ok(rpos == &tpos, "wrong return fpos, expected = %p found = %p\n", rpos, &tpos); - ok(tpos.off == tests[i].telloff_fs, "wrong offset, expected %ld found %ld\n", tests[i].telloff_fs, tpos.off); + ok(tpos.off == tests[i].telloff_fs, "wrong offset, expected %Id found %Id\n", tests[i].telloff_fs, tpos.off); ok(tpos.state == 0, "wrong state, expected = 0 found = %d\n", tpos.state); call_func1(p_basic_fstream_char_vbase_dtor, &fs); @@ -1511,7 +1511,7 @@ static void test_istream_tellg(void) ok(tests[i].tellpos == tpos.pos, "wrong filepos, expected = %s found = %s\n", wine_dbgstr_longlong(tests[i].tellpos), wine_dbgstr_longlong(tpos.pos)); ok(rpos == &tpos, "wrong return fpos, expected = %p found = %p\n", rpos, &tpos); - ok(tpos.off == tests[i].telloff_fs, "wrong offset, expected %ld found %ld\n", tests[i].telloff_fs, tpos.off); + ok(tpos.off == tests[i].telloff_fs, "wrong offset, expected %Id found %Id\n", tests[i].telloff_fs, tpos.off); ok(tpos.state == 0, "wrong state, expected = 0 found = %d\n", tpos.state); call_func1(p_basic_fstream_wchar_vbase_dtor, &wfs);

1 0