January 2022 - Wine-Commits

Huw Davies : winepulse: Remove unnecessary alloc_size.
by Alexandre Julliard Jan. 27, 2022

Jan. 27, 2022

Module: wine Branch: master Commit: bbd26ea8e5aee2aa4c3e4b4f6beaf53acdfba68d URL: https://source.winehq.org/git/wine.git/?a=commit;h=bbd26ea8e5aee2aa4c3e4b4f… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jan 26 13:26:12 2022 +0000 winepulse: Remove unnecessary alloc_size. 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/winepulse.drv/pulse.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/winepulse.drv/pulse.c b/dlls/winepulse.drv/pulse.c index f32f2a3d26c..3e65936a18f 100644 --- a/dlls/winepulse.drv/pulse.c +++ b/dlls/winepulse.drv/pulse.c @@ -59,7 +59,7 @@ struct pulse_stream INT32 locked; BOOL started; - SIZE_T bufsize_frames, alloc_size, real_bufsize_bytes, period_bytes; + SIZE_T bufsize_frames, real_bufsize_bytes, period_bytes; SIZE_T peek_ofs, read_offs_bytes, lcl_offs_bytes, pa_offs_bytes; SIZE_T tmp_buffer_bytes, held_bytes, peek_len, peek_buffer_len, pa_held_bytes; BYTE *local_buffer, *tmp_buffer, *peek_buffer; @@ -868,14 +868,16 @@ static NTSTATUS pulse_create_stream(void *args) if (SUCCEEDED(hr)) { UINT32 unalign; const pa_buffer_attr *attr = pa_stream_get_buffer_attr(stream->stream); + SIZE_T size; + stream->attr = *attr; /* Update frames according to new size */ dump_attr(attr); if (stream->dataflow == eRender) { - stream->alloc_size = stream->real_bufsize_bytes = + size = stream->real_bufsize_bytes = stream->bufsize_frames * 2 * pa_frame_size(&stream->ss); if (NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&stream->local_buffer, - 0, &stream->alloc_size, MEM_COMMIT, PAGE_READWRITE)) + 0, &size, MEM_COMMIT, PAGE_READWRITE)) hr = E_OUTOFMEMORY; } else { UINT32 i, capture_packets; @@ -887,9 +889,9 @@ static NTSTATUS pulse_create_stream(void *args) capture_packets = stream->real_bufsize_bytes / stream->period_bytes; - stream->alloc_size = stream->real_bufsize_bytes + capture_packets * sizeof(ACPacket); + size = stream->real_bufsize_bytes + capture_packets * sizeof(ACPacket); if (NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&stream->local_buffer, - 0, &stream->alloc_size, MEM_COMMIT, PAGE_READWRITE)) + 0, &size, MEM_COMMIT, PAGE_READWRITE)) hr = E_OUTOFMEMORY; else { ACPacket *cur_packet = (ACPacket*)((char*)stream->local_buffer + stream->real_bufsize_bytes);

1 0

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

Jan. 27, 2022

Module: wine Branch: master Commit: 08ebfed582c5c9696aa3fa48616799912ca573a9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=08ebfed582c5c9696aa3fa48… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 27 17:55:23 2022 +0100 gamingtcui: Fix printf format warnings on 64-bit. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gamingtcui/gamingtcui_main.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/gamingtcui/gamingtcui_main.c b/dlls/gamingtcui/gamingtcui_main.c index 555b6d781d3..7c51c28e338 100644 --- a/dlls/gamingtcui/gamingtcui_main.c +++ b/dlls/gamingtcui/gamingtcui_main.c @@ -38,10 +38,10 @@ HRESULT WINAPI ShowPlayerPickerUI(HSTRING prompt_display_text, const HSTRING *xu const HSTRING *preselected_xuids, size_t preselected_xuid_count, size_t min_selection_count, size_t max_selection_count, PlayerPickerUICompletionRoutine completion_routine, void *context) { - FIXME("prompt_display_text %p, xuids %p, xuid_count %lu, preselected_xuids %p, preselected_xuid_count %lu," - " min_selection_count %lu, max_selection_count %lu, completion_routine %p, context %p semi-stub.\n", - prompt_display_text, xuids, (SIZE_T)xuid_count, preselected_xuids, (SIZE_T)preselected_xuid_count, - (SIZE_T)min_selection_count, (SIZE_T)max_selection_count, completion_routine, context); + FIXME("prompt_display_text %p, xuids %p, xuid_count %Iu, preselected_xuids %p, preselected_xuid_count %Iu," + " min_selection_count %Iu, max_selection_count %Iu, completion_routine %p, context %p semi-stub.\n", + prompt_display_text, xuids, xuid_count, preselected_xuids, preselected_xuid_count, + min_selection_count, max_selection_count, completion_routine, context); if (completion_routine) completion_routine(S_OK, context, preselected_xuids, preselected_xuid_count);

1 0

Michael Stefaniuc : dmusic/tests: Add some initial synth port tests.
by Alexandre Julliard Jan. 27, 2022

Jan. 27, 2022

Module: wine Branch: master Commit: b89eaba0036582d61f7863d4a5ba0d6ff45be900 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b89eaba0036582d61f7863d4… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Jan 27 08:51:26 2022 +0100 dmusic/tests: Add some initial synth port tests. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmusic/tests/dmusic.c | 96 ++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 81 insertions(+), 15 deletions(-) diff --git a/dlls/dmusic/tests/dmusic.c b/dlls/dmusic/tests/dmusic.c index cf648228a43..f6b817cca60 100644 --- a/dlls/dmusic/tests/dmusic.c +++ b/dlls/dmusic/tests/dmusic.c @@ -498,31 +498,40 @@ static BOOL missing_dmusic(void) return TRUE; } -static void test_COM_synthport(void) +static IDirectMusicPort *create_synth_port(IDirectMusic **dmusic) { - IDirectMusic *dmusic = NULL; IDirectMusicPort *port = NULL; + DMUS_PORTPARAMS params; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_DirectMusic, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusic, (void **)dmusic); + ok(hr == S_OK, "Cannot create DirectMusic object: %#x\n", hr); + + params.dwSize = sizeof(params); + params.dwValidParams = DMUS_PORTPARAMS_CHANNELGROUPS | DMUS_PORTPARAMS_AUDIOCHANNELS; + params.dwChannelGroups = 1; + params.dwAudioChannels = 2; + hr = IDirectMusic_SetDirectSound(*dmusic, NULL, NULL); + ok(hr == S_OK, "IDirectMusic_SetDirectSound failed: %#x\n", hr); + hr = IDirectMusic_CreatePort(*dmusic, &GUID_NULL, &params, &port, NULL); + ok(hr == S_OK, "IDirectMusic_CreatePort failed: %#x\n", hr); + + return port; +} + +static void test_COM_synthport(void) +{ + IDirectMusic *dmusic; + IDirectMusicPort *port; IDirectMusicPortDownload *dmpd; IDirectMusicThru *dmt; IKsControl *iksc; IReferenceClock *clock; IUnknown *unk; - DMUS_PORTPARAMS port_params; ULONG refcount; HRESULT hr; - /* Create a IDirectMusicPort */ - hr = CoCreateInstance(&CLSID_DirectMusic, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusic, - (void**)&dmusic); - ok(hr == S_OK, "Cannot create DirectMusic object (%x)\n", hr); - port_params.dwSize = sizeof(port_params); - port_params.dwValidParams = DMUS_PORTPARAMS_CHANNELGROUPS | DMUS_PORTPARAMS_AUDIOCHANNELS; - port_params.dwChannelGroups = 1; - port_params.dwAudioChannels = 2; - hr = IDirectMusic_SetDirectSound(dmusic, NULL, NULL); - ok(hr == S_OK, "IDirectMusic_SetDirectSound returned: %x\n", hr); - hr = IDirectMusic_CreatePort(dmusic, &GUID_NULL, &port_params, &port, NULL); - ok(hr == S_OK, "IDirectMusic_CreatePort returned: %x\n", hr); + port = create_synth_port(&dmusic); /* Same refcount for all DirectMusicPort interfaces */ refcount = IDirectMusicPort_AddRef(port); @@ -861,6 +870,62 @@ static void test_master_clock(void) ok(!ref, "Got outstanding refcount %d.\n", ref); } +static void test_synthport(void) +{ + IDirectMusic *dmusic; + IDirectMusicBuffer *buf; + IDirectMusicPort *port; + DMUS_BUFFERDESC desc; + DMUS_PORTCAPS caps; + HRESULT hr; + + port = create_synth_port(&dmusic); + + /* Create a IDirectMusicPortBuffer */ + desc.dwSize = sizeof(DMUS_BUFFERDESC); + desc.dwFlags = 0; + desc.cbBuffer = 1023; + memcpy(&desc.guidBufferFormat, &GUID_NULL, sizeof(GUID)); + hr = IDirectMusic_CreateMusicBuffer(dmusic, &desc, &buf, NULL); + ok(hr == S_OK, "IDirectMusic_CreateMusicBuffer failed: %#x\n", hr); + + /* Unsupported methods */ + hr = IDirectMusicPort_Read(port, NULL); + todo_wine ok(hr == E_POINTER, "Read returned: %#x\n", hr); + hr = IDirectMusicPort_Read(port, buf); + ok(hr == E_NOTIMPL, "Read returned: %#x\n", hr); + hr = IDirectMusicPort_SetReadNotificationHandle(port, NULL); + ok(hr == E_NOTIMPL, "SetReadNotificationHandle returned: %#x\n", hr); + hr = IDirectMusicPort_Compact(port); + ok(hr == E_NOTIMPL, "Compact returned: %#x\n", hr); + + /* GetCaps */ + hr = IDirectMusicPort_GetCaps(port, NULL); + ok(hr == E_INVALIDARG, "GetCaps failed: %#x\n", hr); + memset(&caps, 0, sizeof(caps)); + hr = IDirectMusicPort_GetCaps(port, &caps); + ok(hr == E_INVALIDARG, "GetCaps failed: %#x\n", hr); + caps.dwSize = sizeof(caps); + hr = IDirectMusicPort_GetCaps(port, &caps); + ok(hr == S_OK, "GetCaps failed: %#x\n", hr); + ok(caps.dwSize == sizeof(caps), "dwSize was modified to %d\n", caps.dwSize); + ok(IsEqualGUID(&caps.guidPort, &CLSID_DirectMusicSynth), "Expected port guid CLSID_DirectMusicSynth, got %s\n", + wine_dbgstr_guid(&caps.guidPort)); + ok(caps.dwClass == DMUS_PC_OUTPUTCLASS, "Got wrong dwClass: %#x\n", caps.dwClass); + ok(caps.dwType == DMUS_PORT_USER_MODE_SYNTH, "Got wrong dwType: %#x\n", caps.dwType); + ok(caps.dwFlags == (DMUS_PC_AUDIOPATH|DMUS_PC_DIRECTSOUND|DMUS_PC_DLS|DMUS_PC_DLS2|DMUS_PC_SOFTWARESYNTH| + DMUS_PC_WAVE), "Unexpected dwFlags returned: %#x\n", caps.dwFlags); + ok(caps.dwMemorySize == DMUS_PC_SYSTEMMEMORY, "Got dwMemorySize: %#x\n", caps.dwMemorySize); + ok(caps.dwMaxChannelGroups == 1000, "Got dwMaxChannelGroups: %d\n", caps.dwMaxChannelGroups); + ok(caps.dwMaxVoices == 1000, "Got dwMaxVoices: %d\n", caps.dwMaxVoices); + ok(caps.dwMaxAudioChannels == 2, "Got dwMaxAudioChannels: %#x\n", caps.dwMaxAudioChannels); + ok(caps.dwEffectFlags == DMUS_EFFECT_REVERB, "Unexpected dwEffectFlags returned: %#x\n", caps.dwEffectFlags); + trace("Port wszDescription: %s\n", wine_dbgstr_w(caps.wszDescription)); + + IDirectMusicPort_Release(port); + IDirectMusic_Release(dmusic); +} + START_TEST(dmusic) { CoInitializeEx(NULL, COINIT_MULTITHREADED); @@ -880,6 +945,7 @@ START_TEST(dmusic) test_dmcoll(); test_parsedescriptor(); test_master_clock(); + test_synthport(); CoUninitialize(); }

1 0

Connor McAdams : secur32: Properly handle NULL pInput argument for DTLS contexts in schan_InitializeSecurityContextW.
by Alexandre Julliard Jan. 27, 2022

Jan. 27, 2022

Module: wine Branch: master Commit: 290cd6769fc637d68129f7286f76cad7ef5bc622 URL: https://source.winehq.org/git/wine.git/?a=commit;h=290cd6769fc637d68129f728… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Thu Jan 27 11:11:28 2022 +0100 secur32: Properly handle NULL pInput argument for DTLS contexts in schan_InitializeSecurityContextW. When a NULL pInput argument is passed into InitializeSecurityContextW for an existing DTLS context, we need to retransmit the last handshake packet. 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 | 43 +++++++++++++++++++++++-------------------- dlls/secur32/tests/schannel.c | 10 +++++----- 2 files changed, 28 insertions(+), 25 deletions(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index 71993e1d2d6..c4e01c1e2a7 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -704,7 +704,7 @@ static SECURITY_STATUS SEC_ENTRY schan_InitializeSecurityContextW( struct schan_context *ctx; struct schan_buffers *out_buffers; struct schan_credentials *cred; - SIZE_T expected_size = ~0UL; + SIZE_T expected_size = 0; SECURITY_STATUS ret; SecBuffer *buffer; SecBuffer alloc_buffer = { 0 }; @@ -823,30 +823,33 @@ static SECURITY_STATUS SEC_ENTRY schan_InitializeSecurityContextW( unsigned char *ptr; if (!(ctx = schan_get_object(phContext->dwLower, SCHAN_HANDLE_CTX))) return SEC_E_INVALID_HANDLE; - if (!pInput) return is_dtls_context(ctx) ? SEC_E_INSUFFICIENT_MEMORY : SEC_E_INCOMPLETE_MESSAGE; - if ((idx = schan_find_sec_buffer_idx(pInput, 0, SECBUFFER_TOKEN)) == -1) return SEC_E_INCOMPLETE_MESSAGE; + if (!pInput && !is_dtls_context(ctx)) return SEC_E_INCOMPLETE_MESSAGE; - buffer = &pInput->pBuffers[idx]; - ptr = buffer->pvBuffer; - expected_size = 0; - - while (buffer->cbBuffer > expected_size + ctx->header_size) + if (pInput) { - record_size = ctx->header_size + read_record_size(ptr, ctx->header_size); + if ((idx = schan_find_sec_buffer_idx(pInput, 0, SECBUFFER_TOKEN)) == -1) return SEC_E_INCOMPLETE_MESSAGE; - if (buffer->cbBuffer < expected_size + record_size) break; - expected_size += record_size; - ptr += record_size; - } + buffer = &pInput->pBuffers[idx]; + ptr = buffer->pvBuffer; - if (!expected_size) - { - TRACE("Expected at least %lu bytes, but buffer only contains %u bytes.\n", - max(ctx->header_size + 1, record_size), buffer->cbBuffer); - return SEC_E_INCOMPLETE_MESSAGE; - } + while (buffer->cbBuffer > expected_size + ctx->header_size) + { + record_size = ctx->header_size + read_record_size(ptr, ctx->header_size); - TRACE("Using expected_size %lu.\n", expected_size); + if (buffer->cbBuffer < expected_size + record_size) break; + expected_size += record_size; + ptr += record_size; + } + + if (!expected_size) + { + TRACE("Expected at least %lu bytes, but buffer only contains %u bytes.\n", + max(ctx->header_size + 1, record_size), buffer->cbBuffer); + return SEC_E_INCOMPLETE_MESSAGE; + } + + TRACE("Using expected_size %lu.\n", expected_size); + } if (phNewContext) *phNewContext = *phContext; } diff --git a/dlls/secur32/tests/schannel.c b/dlls/secur32/tests/schannel.c index 6fbe0c34bd1..afcc382927a 100644 --- a/dlls/secur32/tests/schannel.c +++ b/dlls/secur32/tests/schannel.c @@ -1693,17 +1693,17 @@ static void test_dtls(void) ctx_handle2.dwLower = ctx_handle2.dwUpper = 0xdeadbeef; status = InitializeSecurityContextA( &cred_handle, &ctx_handle, (SEC_CHAR *)"winetest", flags_req, 0, 16, NULL, 0, &ctx_handle2, &buffers[1], &attr, &exp ); - todo_wine ok( status == SEC_I_CONTINUE_NEEDED, "got %08x\n", status ); + ok( status == SEC_I_CONTINUE_NEEDED, "got %08x\n", status ); flags_ret = ISC_RET_MANUAL_CRED_VALIDATION | ISC_RET_STREAM | ISC_RET_EXTENDED_ERROR | ISC_RET_DATAGRAM | ISC_RET_USED_SUPPLIED_CREDS | ISC_RET_CONFIDENTIALITY | ISC_RET_SEQUENCE_DETECT | ISC_RET_REPLAY_DETECT; - todo_wine ok( attr == flags_ret, "got %08x\n", attr ); + ok( attr == flags_ret, "got %08x\n", attr ); todo_wine ok( exp.LowPart, "got %08x\n", exp.LowPart ); todo_wine 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); - todo_wine ok( ctx_handle.dwLower == ctx_handle2.dwLower, "dwLower mismatch, expected %#lx, got %#lx\n", ctx_handle.dwLower, ctx_handle2.dwLower); - todo_wine ok( ctx_handle.dwUpper == ctx_handle2.dwUpper, "dwUpper mismatch, expected %#lx, got %#lx\n", ctx_handle.dwUpper, ctx_handle2.dwUpper); + ok( !buffers[1].pBuffers[1].cbBuffer, "Expected SECBUFFER_ALERT buffer to be empty, got %#x\n", buffers[1].pBuffers[1].cbBuffer); + ok( ctx_handle.dwLower == ctx_handle2.dwLower, "dwLower mismatch, expected %#lx, got %#lx\n", ctx_handle.dwLower, ctx_handle2.dwLower); + 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",

1 0

Connor McAdams : secur32: Add support for setting DTLS timeouts.
by Alexandre Julliard Jan. 27, 2022

Jan. 27, 2022

Module: wine Branch: master Commit: 117f79aa199642522c24d72cf9706f34293a10d4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=117f79aa199642522c24d72c… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Thu Jan 27 11:11:26 2022 +0100 secur32: Add support for setting DTLS timeouts. Add support for setting the DTLS timeout values, and set the retransmission timeout value to 0 to allow for retransmission on each call to schan_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/schannel.c | 6 ++++++ dlls/secur32/schannel_gnutls.c | 22 ++++++++++++++++++++++ dlls/secur32/secur32_priv.h | 8 ++++++++ 3 files changed, 36 insertions(+) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index 141a191c7c6..f1b47a78d21 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -808,6 +808,12 @@ static SECURITY_STATUS SEC_ENTRY schan_InitializeSecurityContextW( else WARN("invalid buffer size %u\n", buffer->cbBuffer); } + if (is_dtls_context(ctx)) + { + struct set_dtls_timeouts_params params = { ctx->transport.session, 0, 60000 }; + GNUTLS_CALL( set_dtls_timeouts, &params ); + } + phNewContext->dwLower = handle; phNewContext->dwUpper = 0; } diff --git a/dlls/secur32/schannel_gnutls.c b/dlls/secur32/schannel_gnutls.c index 31fdb769677..ac51cbb5d9f 100644 --- a/dlls/secur32/schannel_gnutls.c +++ b/dlls/secur32/schannel_gnutls.c @@ -60,6 +60,7 @@ static int (*pgnutls_cipher_get_block_size)(gnutls_cipher_algorithm_t); static void (*pgnutls_transport_set_pull_timeout_function)(gnutls_session_t, int (*)(gnutls_transport_ptr_t, unsigned int)); static void (*pgnutls_dtls_set_mtu)(gnutls_session_t, unsigned int); +static void (*pgnutls_dtls_set_timeouts)(gnutls_session_t, unsigned int, unsigned int); /* Not present in gnutls version < 3.2.0. */ static int (*pgnutls_alpn_get_selected_protocol)(gnutls_session_t, gnutls_datum_t *); @@ -198,6 +199,12 @@ static void compat_gnutls_dtls_set_mtu(gnutls_session_t session, unsigned int mt FIXME("\n"); } +static void compat_gnutls_dtls_set_timeouts(gnutls_session_t session, unsigned int retrans_timeout, + unsigned int total_timeout) +{ + FIXME("\n"); +} + static void init_schan_buffers(struct schan_buffers *s, const PSecBufferDesc desc, int (*get_next_buffer)(const struct schan_transport *, struct schan_buffers *)) { @@ -989,6 +996,15 @@ static NTSTATUS schan_set_dtls_mtu( void *args ) return SEC_E_OK; } +static NTSTATUS schan_set_dtls_timeouts( void *args ) +{ + const struct set_dtls_timeouts_params *params = args; + gnutls_session_t s = (gnutls_session_t)params->session; + + pgnutls_dtls_set_timeouts(s, params->retrans_timeout, params->total_timeout); + return SEC_E_OK; +} + static inline void reverse_bytes(BYTE *buf, ULONG len) { BYTE tmp; @@ -1245,6 +1261,11 @@ static NTSTATUS process_attach( void *args ) WARN("gnutls_dtls_set_mtu not found\n"); pgnutls_dtls_set_mtu = compat_gnutls_dtls_set_mtu; } + if (!(pgnutls_dtls_set_timeouts = dlsym(libgnutls_handle, "gnutls_dtls_set_timeouts"))) + { + WARN("gnutls_dtls_set_timeouts not found\n"); + pgnutls_dtls_set_timeouts = compat_gnutls_dtls_set_timeouts; + } if (!(pgnutls_privkey_export_x509 = dlsym(libgnutls_handle, "gnutls_privkey_export_x509"))) { WARN("gnutls_privkey_export_x509 not found\n"); @@ -1308,6 +1329,7 @@ const unixlib_entry_t __wine_unix_call_funcs[] = schan_set_application_protocols, schan_set_dtls_mtu, schan_set_session_target, + schan_set_dtls_timeouts, }; #endif /* SONAME_LIBGNUTLS */ diff --git a/dlls/secur32/secur32_priv.h b/dlls/secur32/secur32_priv.h index c17adc96dc6..64edc0581d6 100644 --- a/dlls/secur32/secur32_priv.h +++ b/dlls/secur32/secur32_priv.h @@ -203,6 +203,13 @@ struct set_session_target_params const char *target; }; +struct set_dtls_timeouts_params +{ + schan_session session; + unsigned int retrans_timeout; + unsigned int total_timeout; +}; + enum schan_funcs { unix_process_attach, @@ -225,6 +232,7 @@ enum schan_funcs unix_set_application_protocols, unix_set_dtls_mtu, unix_set_session_target, + unix_set_dtls_timeouts, }; #endif /* __SECUR32_PRIV_H__ */

1 0

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

Jan. 27, 2022

Module: wine Branch: master Commit: 71ee671b65bd3895d015b54b534e3e0b64b95754 URL: https://source.winehq.org/git/wine.git/?a=commit;h=71ee671b65bd3895d015b54b… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Jan 27 02:03:08 2022 +0300 winhttp: Allow synchronous nonblocking send in send_socket_shutdown(). 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 | 75 +++++++++++++++++++++++++++------------ dlls/winhttp/tests/notification.c | 2 +- dlls/winhttp/winhttp_private.h | 2 ++ 3 files changed, 55 insertions(+), 24 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index a5bd828c9b7..62f53995258 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -3727,6 +3727,19 @@ DWORD WINAPI WinHttpWebSocketReceive( HINTERNET hsocket, void *buf, DWORD len, D return ret; } +static void socket_shutdown_complete( struct socket *socket, DWORD ret ) +{ + if (!ret) send_callback( &socket->hdr, WINHTTP_CALLBACK_STATUS_SHUTDOWN_COMPLETE, NULL, 0 ); + else + { + WINHTTP_WEB_SOCKET_ASYNC_RESULT result; + result.AsyncResult.dwResult = API_WRITE_DATA; + result.AsyncResult.dwError = ret; + result.Operation = WINHTTP_WEB_SOCKET_SHUTDOWN_OPERATION; + send_callback( &socket->hdr, WINHTTP_CALLBACK_STATUS_REQUEST_ERROR, &result, sizeof(result) ); + } +} + static void CALLBACK task_socket_shutdown( TP_CALLBACK_INSTANCE *instance, void *ctx, TP_WORK *work ) { struct socket_shutdown *s = ctx; @@ -3734,21 +3747,11 @@ static void CALLBACK task_socket_shutdown( TP_CALLBACK_INSTANCE *instance, void TRACE("running %p\n", work); - ret = send_frame( s->socket, SOCKET_OPCODE_CLOSE, s->status, s->reason, s->len, TRUE, NULL ); - send_io_complete( &s->socket->hdr ); + if (s->complete_async) ret = complete_send_frame( s->socket, &s->ovr, s->reason ); + else ret = send_frame( s->socket, SOCKET_OPCODE_CLOSE, s->status, s->reason, s->len, TRUE, NULL ); - if (s->send_callback) - { - if (!ret) send_callback( &s->socket->hdr, WINHTTP_CALLBACK_STATUS_SHUTDOWN_COMPLETE, NULL, 0 ); - else - { - WINHTTP_WEB_SOCKET_ASYNC_RESULT result; - result.AsyncResult.dwResult = API_WRITE_DATA; - result.AsyncResult.dwError = ret; - result.Operation = WINHTTP_WEB_SOCKET_SHUTDOWN_OPERATION; - send_callback( &s->socket->hdr, WINHTTP_CALLBACK_STATUS_REQUEST_ERROR, &result, sizeof(result) ); - } - } + send_io_complete( &s->socket->hdr ); + if (s->send_callback) socket_shutdown_complete( s->socket, ret ); release_object( &s->socket->hdr ); free( s ); } @@ -3762,22 +3765,48 @@ static DWORD send_socket_shutdown( struct socket *socket, USHORT status, const v if (socket->request->connect->hdr.flags & WINHTTP_FLAG_ASYNC) { + BOOL async_send, complete_async = FALSE; struct socket_shutdown *s; if (!(s = malloc( sizeof(*s) ))) return FALSE; - s->socket = socket; - s->status = status; - memcpy( s->reason, reason, len ); - s->len = len; - s->send_callback = send_callback; - addref_object( &socket->hdr ); - InterlockedIncrement( &socket->hdr.pending_sends ); - if ((ret = queue_task( &socket->send_q, task_socket_shutdown, s ))) + async_send = InterlockedIncrement( &socket->hdr.pending_sends ) > 1 || socket->hdr.recursion_count >= 3; + if (!async_send) + { + memset( &s->ovr, 0, sizeof(s->ovr) ); + if ((ret = send_frame( socket, SOCKET_OPCODE_CLOSE, status, reason, len, TRUE, &s->ovr )) == WSA_IO_PENDING) + { + async_send = TRUE; + complete_async = TRUE; + } + } + + if (async_send) + { + s->complete_async = complete_async; + s->socket = socket; + s->status = status; + memcpy( s->reason, reason, len ); + s->len = len; + s->send_callback = send_callback; + + addref_object( &socket->hdr ); + if ((ret = queue_task( &socket->send_q, task_socket_shutdown, s ))) + { + InterlockedDecrement( &socket->hdr.pending_sends ); + release_object( &socket->hdr ); + free( s ); + } + } + else { InterlockedDecrement( &socket->hdr.pending_sends ); - release_object( &socket->hdr ); free( s ); + if (send_callback) + { + socket_shutdown_complete( socket, ret ); + ret = ERROR_SUCCESS; + } } } else ret = send_frame( socket, SOCKET_OPCODE_CLOSE, status, reason, len, TRUE, NULL ); diff --git a/dlls/winhttp/tests/notification.c b/dlls/winhttp/tests/notification.c index 5ec8740f66e..1ae7e1af2e7 100644 --- a/dlls/winhttp/tests/notification.c +++ b/dlls/winhttp/tests/notification.c @@ -677,7 +677,7 @@ static const struct notification websocket_test[] = { winhttp_websocket_complete_upgrade, WINHTTP_CALLBACK_STATUS_HANDLE_CREATED, NF_SIGNAL }, { winhttp_websocket_send, WINHTTP_CALLBACK_STATUS_WRITE_COMPLETE, NF_MAIN_THREAD | NF_SIGNAL }, { winhttp_websocket_send, WINHTTP_CALLBACK_STATUS_WRITE_COMPLETE, NF_MAIN_THREAD | NF_SIGNAL }, - { winhttp_websocket_shutdown, WINHTTP_CALLBACK_STATUS_SHUTDOWN_COMPLETE, NF_SIGNAL }, + { winhttp_websocket_shutdown, WINHTTP_CALLBACK_STATUS_SHUTDOWN_COMPLETE, NF_MAIN_THREAD | NF_SIGNAL }, { winhttp_websocket_receive, WINHTTP_CALLBACK_STATUS_READ_COMPLETE, NF_SAVE_BUFFER | NF_SIGNAL }, { winhttp_websocket_receive, WINHTTP_CALLBACK_STATUS_READ_COMPLETE, NF_SAVE_BUFFER | NF_SIGNAL }, { winhttp_websocket_close, WINHTTP_CALLBACK_STATUS_CLOSE_COMPLETE, NF_SIGNAL }, diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index b41eb0ee676..3e4e1eb298d 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -323,6 +323,8 @@ struct socket_shutdown char reason[123]; DWORD len; BOOL send_callback; + WSAOVERLAPPED ovr; + BOOL complete_async; }; struct object_header *addref_object( struct object_header * ) DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : include: Use long type by default in GUID definition.
by Alexandre Julliard Jan. 27, 2022

Jan. 27, 2022

Module: wine Branch: master Commit: ae2693e2c4079edcc719c08abed5ad58ba7aace7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ae2693e2c4079edcc719c08a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 27 11:15:55 2022 +0100 include: Use long type by default in GUID definition. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dxof/parsing.c | 2 +- dlls/dispex/tests/marshal.c | 2 +- dlls/iphlpapi/tests/iphlpapi.c | 2 +- dlls/mountmgr.sys/dbus.c | 2 +- dlls/ole32/storage32.c | 2 +- dlls/ole32/tests/compobj.c | 18 +++++++++--------- dlls/oleaut32/tests/typelib.c | 14 +++++++------- dlls/urlmon/tests/misc.c | 8 ++++---- dlls/win32u/sysparams.c | 2 +- include/guiddef.h | 2 +- programs/winedbg/memory.c | 2 +- tools/winedump/dump.c | 2 +- tools/winedump/tlb.c | 2 +- 13 files changed, 30 insertions(+), 30 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ae2693e2c4079edcc719…

1 0

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

Jan. 27, 2022

Module: wine Branch: master Commit: 49482c95e991118c9646765de5ef9754e6e73a9d URL: https://source.winehq.org/git/wine.git/?a=commit;h=49482c95e991118c9646765d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 27 17:55:31 2022 +0100 loadperf: Fix printf format warnings on 64-bit. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/loadperf/loadperf_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/loadperf/loadperf_main.c b/dlls/loadperf/loadperf_main.c index c58f46f4204..a8ed70bfe7a 100644 --- a/dlls/loadperf/loadperf_main.c +++ b/dlls/loadperf/loadperf_main.c @@ -71,7 +71,7 @@ DWORD WINAPI InstallPerfDllA(LPCSTR computer, LPCSTR ini, ULONG_PTR flags) */ DWORD WINAPI InstallPerfDllW(LPCWSTR computer, LPCWSTR ini, ULONG_PTR flags) { - FIXME("(%s, %s, %lx)\n", debugstr_w(computer), debugstr_w(ini), flags); + FIXME("(%s, %s, %Ix)\n", debugstr_w(computer), debugstr_w(ini), flags); return ERROR_SUCCESS; }

1 0

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

Jan. 27, 2022

Module: wine Branch: master Commit: e7d0bf366864cb2b0a2a05c75207577d02ab6cf5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e7d0bf366864cb2b0a2a05c7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 27 17:54:57 2022 +0100 compstui: Fix printf format warnings on 64-bit. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/compstui/compstui_main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/compstui/compstui_main.c b/dlls/compstui/compstui_main.c index 8dc715666c4..96ca3343963 100644 --- a/dlls/compstui/compstui_main.c +++ b/dlls/compstui/compstui_main.c @@ -37,7 +37,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(compstui); */ LONG WINAPI CommonPropertySheetUIA(HWND hWnd, PFNPROPSHEETUI pfnPropSheetUI, LPARAM lparam, LPDWORD pResult) { - FIXME("(%p, %p, 0x%lx, %p)\n", hWnd, pfnPropSheetUI, lparam, pResult); + FIXME("(%p, %p, 0x%Ix, %p)\n", hWnd, pfnPropSheetUI, lparam, pResult); return CPSUI_CANCEL; } @@ -47,7 +47,7 @@ LONG WINAPI CommonPropertySheetUIA(HWND hWnd, PFNPROPSHEETUI pfnPropSheetUI, LPA */ LONG WINAPI CommonPropertySheetUIW(HWND hWnd, PFNPROPSHEETUI pfnPropSheetUI, LPARAM lparam, LPDWORD pResult) { - FIXME("(%p, %p, 0x%lx, %p)\n", hWnd, pfnPropSheetUI, lparam, pResult); + FIXME("(%p, %p, 0x%Ix, %p)\n", hWnd, pfnPropSheetUI, lparam, pResult); return CPSUI_CANCEL; } @@ -67,6 +67,6 @@ ULONG_PTR WINAPI GetCPSUIUserData(HWND hDlg) */ BOOL WINAPI SetCPSUIUserData(HWND hDlg, ULONG_PTR UserData ) { - FIXME("(%p, %08lx): stub\n", hDlg, UserData); + FIXME("(%p, %08Ix): stub\n", hDlg, UserData); return TRUE; }

1 0

Alexandre Julliard : winecrt0: Use the correct integral type.
by Alexandre Julliard Jan. 27, 2022

Jan. 27, 2022

Module: wine Branch: master Commit: 0cdf9359e0b02e38b999113c5f86f048fda09f1c URL: https://source.winehq.org/git/wine.git/?a=commit;h=0cdf9359e0b02e38b999113c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 27 17:54:12 2022 +0100 winecrt0: Use the correct integral type. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winecrt0/debug.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winecrt0/debug.c b/dlls/winecrt0/debug.c index 14f3d2d3773..6e1866c7568 100644 --- a/dlls/winecrt0/debug.c +++ b/dlls/winecrt0/debug.c @@ -160,7 +160,7 @@ static void init_options(void) static const char * __cdecl fallback__wine_dbg_strdup( const char *str ) { static char *list[32]; - static int pos; + static LONG pos; char *ret = strdup( str ); int idx;

1 0