wine-commits September 2022

wine-commits@winehq.org

1 participants
553 discussions

Davide Beatrici : winecoreaudio: Adapt "get_capture_buffer_params" struct to mmdevapi's.
by Alexandre Julliard 16 Sep '22

16 Sep '22

Module: wine Branch: master Commit: af1257f741cb2f18423e869f46677983842c1dd9 URL: https://gitlab.winehq.org/wine/wine/-/commit/af1257f741cb2f18423e869f466779… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Fri Sep 9 09:21:17 2022 +0200 winecoreaudio: Adapt "get_capture_buffer_params" struct to mmdevapi's. --- dlls/winecoreaudio.drv/mmdevdrv.c | 2 +- dlls/winecoreaudio.drv/unixlib.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index 03250a61cf7..8902356d1e0 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -1357,7 +1357,7 @@ static HRESULT WINAPI AudioCaptureClient_GetBuffer(IAudioCaptureClient *iface, params.stream = This->stream; params.data = data; params.frames = frames; - params.flags = flags; + params.flags = (UINT *)flags; params.devpos = devpos; params.qpcpos = qpcpos; UNIX_CALL(get_capture_buffer, &params); diff --git a/dlls/winecoreaudio.drv/unixlib.h b/dlls/winecoreaudio.drv/unixlib.h index 603796e9510..b91f90496d5 100644 --- a/dlls/winecoreaudio.drv/unixlib.h +++ b/dlls/winecoreaudio.drv/unixlib.h @@ -99,7 +99,7 @@ struct get_capture_buffer_params HRESULT result; BYTE **data; UINT32 *frames; - DWORD *flags; + UINT *flags; UINT64 *devpos; UINT64 *qpcpos; };

1 0

Davide Beatrici : winecoreaudio: Adapt "release_render_buffer_params" struct to mmdevapi's.
by Alexandre Julliard 16 Sep '22

16 Sep '22

Module: wine Branch: master Commit: 0987d1b002003e88a28ac221a76671e5d6faa995 URL: https://gitlab.winehq.org/wine/wine/-/commit/0987d1b002003e88a28ac221a76671… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Fri Sep 9 09:16:20 2022 +0200 winecoreaudio: Adapt "release_render_buffer_params" struct to mmdevapi's. --- dlls/winecoreaudio.drv/coreaudio.c | 14 +++++++------- dlls/winecoreaudio.drv/mmdevdrv.c | 2 +- dlls/winecoreaudio.drv/unixlib.h | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/winecoreaudio.drv/coreaudio.c b/dlls/winecoreaudio.drv/coreaudio.c index 25e74cc2712..bfc637958bb 100644 --- a/dlls/winecoreaudio.drv/coreaudio.c +++ b/dlls/winecoreaudio.drv/coreaudio.c @@ -1424,12 +1424,12 @@ static NTSTATUS unix_release_render_buffer(void *args) OSSpinLockLock(&stream->lock); - if(!params->frames){ + if(!params->written_frames){ stream->getbuf_last = 0; params->result = S_OK; }else if(!stream->getbuf_last) params->result = AUDCLNT_E_OUT_OF_ORDER; - else if(params->frames > (stream->getbuf_last >= 0 ? stream->getbuf_last : -stream->getbuf_last)) + else if(params->written_frames > (stream->getbuf_last >= 0 ? stream->getbuf_last : -stream->getbuf_last)) params->result = AUDCLNT_E_INVALID_SIZE; else{ if(stream->getbuf_last >= 0) @@ -1438,18 +1438,18 @@ static NTSTATUS unix_release_render_buffer(void *args) buffer = stream->tmp_buffer; if(params->flags & AUDCLNT_BUFFERFLAGS_SILENT) - silence_buffer(stream, buffer, params->frames); + silence_buffer(stream, buffer, params->written_frames); if(stream->getbuf_last < 0) ca_wrap_buffer(stream->local_buffer, stream->wri_offs_frames * stream->fmt->nBlockAlign, stream->bufsize_frames * stream->fmt->nBlockAlign, - buffer, params->frames * stream->fmt->nBlockAlign); + buffer, params->written_frames * stream->fmt->nBlockAlign); - stream->wri_offs_frames += params->frames; + stream->wri_offs_frames += params->written_frames; stream->wri_offs_frames %= stream->bufsize_frames; - stream->held_frames += params->frames; - stream->written_frames += params->frames; + stream->held_frames += params->written_frames; + stream->written_frames += params->written_frames; stream->getbuf_last = 0; params->result = S_OK; diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index c6a31d2480b..03250a61cf7 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -1285,7 +1285,7 @@ static HRESULT WINAPI AudioRenderClient_ReleaseBuffer( TRACE("(%p)->(%u, %lx)\n", This, frames, flags); params.stream = This->stream; - params.frames = frames; + params.written_frames = frames; params.flags = flags; UNIX_CALL(release_render_buffer, &params); return params.result; diff --git a/dlls/winecoreaudio.drv/unixlib.h b/dlls/winecoreaudio.drv/unixlib.h index 50e224e4c26..603796e9510 100644 --- a/dlls/winecoreaudio.drv/unixlib.h +++ b/dlls/winecoreaudio.drv/unixlib.h @@ -88,8 +88,8 @@ struct get_render_buffer_params struct release_render_buffer_params { stream_handle stream; - UINT32 frames; - DWORD flags; + UINT32 written_frames; + UINT flags; HRESULT result; };

1 0

Davide Beatrici : winecoreaudio: Adapt "release_stream_params" struct to mmdevapi's.
by Alexandre Julliard 16 Sep '22

16 Sep '22

Module: wine Branch: master Commit: 9a30a71e3b1a76f5aa877410bc13d6d59f627a62 URL: https://gitlab.winehq.org/wine/wine/-/commit/9a30a71e3b1a76f5aa877410bc13d6… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Fri Sep 9 08:53:16 2022 +0200 winecoreaudio: Adapt "release_stream_params" struct to mmdevapi's. --- dlls/winecoreaudio.drv/coreaudio.c | 20 +++++++++++++++++++- dlls/winecoreaudio.drv/mmdevdrv.c | 1 + dlls/winecoreaudio.drv/unixlib.h | 1 + 3 files changed, 21 insertions(+), 1 deletion(-) diff --git a/dlls/winecoreaudio.drv/coreaudio.c b/dlls/winecoreaudio.drv/coreaudio.c index 4f469b582ce..25e74cc2712 100644 --- a/dlls/winecoreaudio.drv/coreaudio.c +++ b/dlls/winecoreaudio.drv/coreaudio.c @@ -1737,6 +1737,24 @@ static NTSTATUS unix_wow64_create_stream(void *args) return STATUS_SUCCESS; } +static NTSTATUS unix_wow64_release_stream(void *args) +{ + struct + { + stream_handle stream; + PTR32 timer_thread; + HRESULT result; + } *params32 = args; + struct release_stream_params params = + { + .stream = params32->stream, + .timer_thread = ULongToHandle(params32->timer_thread) + }; + unix_release_stream(&params); + params32->result = params.result; + return STATUS_SUCCESS; +} + static NTSTATUS unix_wow64_get_render_buffer(void *args) { struct @@ -1966,7 +1984,7 @@ unixlib_entry_t __wine_unix_call_wow64_funcs[] = { unix_wow64_get_endpoint_ids, unix_wow64_create_stream, - unix_release_stream, + unix_wow64_release_stream, unix_start, unix_stop, unix_reset, diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index 79d617650f4..c6a31d2480b 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -535,6 +535,7 @@ static ULONG WINAPI AudioClient_Release(IAudioClient3 *iface) } if(This->stream){ params.stream = This->stream; + params.timer_thread = NULL; UNIX_CALL(release_stream, &params); } if(This->session){ diff --git a/dlls/winecoreaudio.drv/unixlib.h b/dlls/winecoreaudio.drv/unixlib.h index 2c22eef5cc4..50e224e4c26 100644 --- a/dlls/winecoreaudio.drv/unixlib.h +++ b/dlls/winecoreaudio.drv/unixlib.h @@ -55,6 +55,7 @@ struct create_stream_params struct release_stream_params { stream_handle stream; + HANDLE timer_thread; HRESULT result; };

1 0

Davide Beatrici : winecoreaudio: Adapt "create_stream_params" struct to mmdevapi's.
by Alexandre Julliard 16 Sep '22

16 Sep '22

Module: wine Branch: master Commit: de9da9bcdb8873a5582e1ae85d81a4880f0ccc5d URL: https://gitlab.winehq.org/wine/wine/-/commit/de9da9bcdb8873a5582e1ae85d81a4… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Fri Sep 9 08:41:43 2022 +0200 winecoreaudio: Adapt "create_stream_params" struct to mmdevapi's. --- dlls/winecoreaudio.drv/coreaudio.c | 6 ++++++ dlls/winecoreaudio.drv/mmdevdrv.c | 3 +++ dlls/winecoreaudio.drv/unixlib.h | 3 +++ 3 files changed, 12 insertions(+) diff --git a/dlls/winecoreaudio.drv/coreaudio.c b/dlls/winecoreaudio.drv/coreaudio.c index e3e697dad88..4f469b582ce 100644 --- a/dlls/winecoreaudio.drv/coreaudio.c +++ b/dlls/winecoreaudio.drv/coreaudio.c @@ -1707,23 +1707,29 @@ static NTSTATUS unix_wow64_create_stream(void *args) { struct { + PTR32 name; PTR32 device; EDataFlow flow; AUDCLNT_SHAREMODE share; + DWORD flags; REFERENCE_TIME duration; REFERENCE_TIME period; PTR32 fmt; HRESULT result; + PTR32 channel_count; PTR32 stream; } *params32 = args; struct create_stream_params params = { + .name = ULongToPtr(params32->name), .device = ULongToPtr(params32->device), .flow = params32->flow, .share = params32->share, + .flags = params32->flags, .duration = params32->duration, .period = params32->period, .fmt = ULongToPtr(params32->fmt), + .channel_count = ULongToPtr(params32->channel_count), .stream = ULongToPtr(params32->stream) }; unix_create_stream(&params); diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index 2d061db4e1b..79d617650f4 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -734,12 +734,15 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, return AUDCLNT_E_ALREADY_INITIALIZED; } + params.name = NULL; params.device = This->device_name; params.flow = This->dataflow; params.share = mode; + params.flags = flags; params.duration = duration; params.period = period; params.fmt = fmt; + params.channel_count = NULL; params.stream = &stream; UNIX_CALL(create_stream, &params); diff --git a/dlls/winecoreaudio.drv/unixlib.h b/dlls/winecoreaudio.drv/unixlib.h index a01999daffd..2c22eef5cc4 100644 --- a/dlls/winecoreaudio.drv/unixlib.h +++ b/dlls/winecoreaudio.drv/unixlib.h @@ -39,13 +39,16 @@ struct get_endpoint_ids_params struct create_stream_params { + const char *name; const char *device; EDataFlow flow; AUDCLNT_SHAREMODE share; + DWORD flags; REFERENCE_TIME duration; REFERENCE_TIME period; const WAVEFORMATEX *fmt; HRESULT result; + UINT32 *channel_count; stream_handle *stream; };

1 0

Davide Beatrici : winecoreaudio: Drop "unix_" prefix in unixlib enum, apply it to the functions instead.
by Alexandre Julliard 16 Sep '22

16 Sep '22

Module: wine Branch: master Commit: bc404b6c9c93a80e9a6e2ddd607a8fe276fc12dc URL: https://gitlab.winehq.org/wine/wine/-/commit/bc404b6c9c93a80e9a6e2ddd607a8f… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Fri Sep 9 07:15:36 2022 +0200 winecoreaudio: Drop "unix_" prefix in unixlib enum, apply it to the functions instead. --- dlls/winecoreaudio.drv/coreaudio.c | 194 ++++++++++++++++++------------------- dlls/winecoreaudio.drv/coremidi.c | 26 ++--- dlls/winecoreaudio.drv/unixlib.h | 70 ++++++------- 3 files changed, 145 insertions(+), 145 deletions(-)

1 0

Davide Beatrici : mmdevapi: Integrate winecoreaudio's additions in unixlib.h.
by Alexandre Julliard 16 Sep '22

16 Sep '22

Module: wine Branch: master Commit: 2fa22538a582b9e4ed40272d5b511c6ddebdf6b9 URL: https://gitlab.winehq.org/wine/wine/-/commit/2fa22538a582b9e4ed40272d5b511c… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Fri Sep 9 22:06:18 2022 +0200 mmdevapi: Integrate winecoreaudio's additions in unixlib.h. The data type for "done" was accidentally changed in e29dc33aebf4e1d4e30fd158b69338331edd3f65. BOOL is basically the same as UINT32, but it should only be used for flags. BOOLEAN would be better for that though, as it's single-byte. --- dlls/mmdevapi/unixlib.h | 13 ++++++++++--- dlls/winealsa.drv/alsa.c | 12 ++++++++---- dlls/winealsa.drv/alsamidi.c | 6 +++--- dlls/winealsa.drv/mmdevdrv.c | 3 ++- dlls/wineoss.drv/mmdevdrv.c | 3 ++- dlls/wineoss.drv/oss.c | 12 ++++++++---- dlls/wineoss.drv/ossmidi.c | 6 +++--- dlls/winepulse.drv/mmdevdrv.c | 3 ++- dlls/winepulse.drv/pulse.c | 12 ++++++++---- 9 files changed, 46 insertions(+), 24 deletions(-)

1 0

Davide Beatrici : winecoreaudio: Switch to string as device identifier, to match other drivers.
by Alexandre Julliard 16 Sep '22

16 Sep '22

Module: wine Branch: master Commit: 013f662c050148e9ce25357ac8b2695254e58d88 URL: https://gitlab.winehq.org/wine/wine/-/commit/013f662c050148e9ce25357ac8b269… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Fri Sep 16 06:38:06 2022 +0200 winecoreaudio: Switch to string as device identifier, to match other drivers. --- dlls/winecoreaudio.drv/coreaudio.c | 52 +++++++++++++++++++++++--------------- dlls/winecoreaudio.drv/mmdevdrv.c | 35 +++++++++++++------------ dlls/winecoreaudio.drv/unixlib.h | 8 +++--- 3 files changed, 55 insertions(+), 40 deletions(-)

1 0

Davide Beatrici : winecoreaudio: Fix RegEnumKeyExW() call passing wrong unit for the buffer size.
by Alexandre Julliard 16 Sep '22

16 Sep '22

Module: wine Branch: master Commit: 93d3ecb90f00093b5c6a834cb407666f05ba3d3b URL: https://gitlab.winehq.org/wine/wine/-/commit/93d3ecb90f00093b5c6a834cb40766… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Fri Sep 16 10:25:41 2022 +0200 winecoreaudio: Fix RegEnumKeyExW() call passing wrong unit for the buffer size. The function takes the number of (wide) characters in input, not bytes. --- dlls/winecoreaudio.drv/mmdevdrv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index da6c05bdc1f..69b61781058 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -388,7 +388,7 @@ static BOOL get_deviceid_by_guid(GUID *guid, DWORD *id, EDataFlow *flow) DWORD size, type; GUID reg_guid; - key_name_size = sizeof(key_name); + key_name_size = ARRAY_SIZE(key_name); if(RegEnumKeyExW(devices_key, i++, key_name, &key_name_size, NULL, NULL, NULL, NULL) != ERROR_SUCCESS) break;

1 0

Nikolay Sivov : xmllite/writer: Enable some more tests for WriteNode().
by Alexandre Julliard 16 Sep '22

16 Sep '22

Module: wine Branch: master Commit: 2821d9cb4115b7f8dca8bc2502e8df969de20bcc URL: https://gitlab.winehq.org/wine/wine/-/commit/2821d9cb4115b7f8dca8bc2502e8df… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Sep 16 11:19:54 2022 +0300 xmllite/writer: Enable some more tests for WriteNode(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/xmllite/tests/writer.c | 40 ++++++++++++++++++++++++++++++++++++---- dlls/xmllite/writer.c | 6 ++++++ 2 files changed, 42 insertions(+), 4 deletions(-) diff --git a/dlls/xmllite/tests/writer.c b/dlls/xmllite/tests/writer.c index 25dc9e3b8c1..7b98f61a207 100644 --- a/dlls/xmllite/tests/writer.c +++ b/dlls/xmllite/tests/writer.c @@ -136,8 +136,12 @@ static void writer_set_property(IXmlWriter *writer, XmlWriterProperty property) /* used to test all Write* methods for consistent error state */ static void check_writer_state(IXmlWriter *writer, HRESULT exp_hr) { + IXmlReader *reader; HRESULT hr; + hr = CreateXmlReader(&IID_IXmlReader, (void **)&reader, NULL); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + /* FIXME: add WriteAttributes */ hr = IXmlWriter_WriteAttributeString(writer, NULL, L"a", NULL, L"a"); @@ -179,8 +183,18 @@ static void check_writer_state(IXmlWriter *writer, HRESULT exp_hr) hr = IXmlWriter_WriteNmToken(writer, L"a"); ok(hr == exp_hr, "Unexpected hr %#lx, expected %#lx.\n", hr, exp_hr); - /* FIXME: add WriteNode */ - /* FIXME: add WriteNodeShallow */ + hr = IXmlWriter_WriteNode(writer, NULL, FALSE); + ok(hr == E_INVALIDARG, "Unexpected hr %#lx, expected %#lx.\n", hr, exp_hr); + + reader_set_input(reader, "<a/>"); + hr = IXmlWriter_WriteNode(writer, reader, FALSE); + ok(hr == exp_hr, "Unexpected hr %#lx, expected %#lx.\n", hr, exp_hr); + + reader_set_input(reader, "<a/>"); + hr = IXmlReader_Read(reader, NULL); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + hr = IXmlWriter_WriteNodeShallow(writer, reader, FALSE); + ok(hr == exp_hr, "Unexpected hr %#lx, expected %#lx.\n", hr, exp_hr); hr = IXmlWriter_WriteProcessingInstruction(writer, L"a", L"a"); ok(hr == exp_hr, "Unexpected hr %#lx, expected %#lx.\n", hr, exp_hr); @@ -207,6 +221,8 @@ static void check_writer_state(IXmlWriter *writer, HRESULT exp_hr) hr = IXmlWriter_WriteWhitespace(writer, L" "); ok(hr == exp_hr, "Unexpected hr %#lx, expected %#lx.\n", hr, exp_hr); + + IXmlReader_Release(reader); } static IStream *writer_set_output(IXmlWriter *writer) @@ -354,8 +370,12 @@ static void test_writer_create(void) static void test_invalid_output_encoding(IXmlWriter *writer, IUnknown *output) { + IXmlReader *reader; HRESULT hr; + hr = CreateXmlReader(&IID_IXmlReader, (void **)&reader, NULL); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + hr = IXmlWriter_SetOutput(writer, output); ok(hr == S_OK, "Failed to set output, hr %#lx.\n", hr); @@ -400,8 +420,12 @@ static void test_invalid_output_encoding(IXmlWriter *writer, IUnknown *output) hr = IXmlWriter_WriteNmToken(writer, L"a"); ok(hr == MX_E_ENCODING, "Unexpected hr %#lx.\n", hr); - /* TODO: WriteNode */ - /* TODO: WriteNodeShallow */ + reader_set_input(reader, "<a/>"); + hr = IXmlWriter_WriteNode(writer, reader, FALSE); + ok(hr == MX_E_ENCODING, "Unexpected hr %#lx.\n", hr); + + hr = IXmlWriter_WriteNodeShallow(writer, reader, FALSE); + ok(hr == MX_E_ENCODING, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_WriteProcessingInstruction(writer, L"a", L"a"); ok(hr == MX_E_ENCODING, "Unexpected hr %#lx.\n", hr); @@ -431,6 +455,8 @@ static void test_invalid_output_encoding(IXmlWriter *writer, IUnknown *output) hr = IXmlWriter_Flush(writer); ok(hr == S_OK, "Failed to flush, hr %#lx.\n", hr); + + IXmlReader_Release(reader); } static void test_writeroutput(void) @@ -2295,6 +2321,9 @@ static void test_WriteNode(void) hr = CreateXmlWriter(&IID_IXmlWriter, (void **)&writer, NULL); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + hr = IXmlWriter_WriteNode(writer, NULL, FALSE); + ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); + hr = CreateXmlReader(&IID_IXmlReader, (void **)&reader, NULL); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); @@ -2445,6 +2474,9 @@ static void test_WriteNodeShallow(void) hr = CreateXmlWriter(&IID_IXmlWriter, (void **)&writer, NULL); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + hr = IXmlWriter_WriteNodeShallow(writer, NULL, FALSE); + ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); + hr = CreateXmlReader(&IID_IXmlReader, (void **)&reader, NULL); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); diff --git a/dlls/xmllite/writer.c b/dlls/xmllite/writer.c index fb2784ab439..1e1a8e8ddb8 100644 --- a/dlls/xmllite/writer.c +++ b/dlls/xmllite/writer.c @@ -1600,6 +1600,9 @@ static HRESULT WINAPI xmlwriter_WriteNode(IXmlWriter *iface, IXmlReader *reader, TRACE("%p, %p, %d.\n", iface, reader, write_default_attributes); + if (!reader) + return E_INVALIDARG; + if (SUCCEEDED(hr = writer_write_node(iface, reader, FALSE, write_default_attributes))) hr = IXmlReader_Read(reader, NULL); @@ -1610,6 +1613,9 @@ static HRESULT WINAPI xmlwriter_WriteNodeShallow(IXmlWriter *iface, IXmlReader * { TRACE("%p, %p, %d.\n", iface, reader, write_default_attributes); + if (!reader) + return E_INVALIDARG; + return writer_write_node(iface, reader, TRUE, write_default_attributes); }

1 0

Alistair Leslie-Hughes : ws2_32: Return a valid value for WSAIoctl SIO_IDEAL_SEND_BACKLOG_QUERY.
by Alexandre Julliard 16 Sep '22

16 Sep '22

Module: wine Branch: master Commit: 493db3b1f799c9af1e3bad5fcf974aa0f3861cca URL: https://gitlab.winehq.org/wine/wine/-/commit/493db3b1f799c9af1e3bad5fcf974a… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Sep 15 19:44:38 2020 +1000 ws2_32: Return a valid value for WSAIoctl SIO_IDEAL_SEND_BACKLOG_QUERY. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/ws2_32/socket.c | 39 +++++++++++++++++++++++++++++++++++++ dlls/ws2_32/tests/sock.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 89 insertions(+) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 9d51fef1adb..2f115f02e48 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2327,6 +2327,45 @@ INT WINAPI WSAIoctl(SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size, LPVOID return ret ? -1 : 0; } + case SIO_IDEAL_SEND_BACKLOG_QUERY: + { + DWORD ret; + WSAPROTOCOL_INFOA proto_info; + int proto_len, len; + struct sockaddr addr; + + if (!out_buff || out_size < sizeof(DWORD)) + { + SetLastError(WSAEFAULT); + return SOCKET_ERROR; + } + + proto_len = sizeof(WSAPROTOCOL_INFOA); + ret = getsockopt(s, SOL_SOCKET, SO_PROTOCOL_INFOA, (char *)&proto_info, &proto_len); + if (ret == SOCKET_ERROR) + return SOCKET_ERROR; + + if (proto_info.iSocketType != SOCK_STREAM) + { + SetLastError( WSAEOPNOTSUPP ); + return SOCKET_ERROR; + } + + len = sizeof(addr); + if (getpeername( s, &addr, &len ) == SOCKET_ERROR) + { + return SOCKET_ERROR; + } + + *(DWORD*)out_buff = 0x10000; /* 64k */ + + WARN("SIO_IDEAL_SEND_BACKLOG_QUERY Always returning 64k\n"); + + SetLastError( ret ); + *ret_size = sizeof(DWORD); + return 0; + } + case SIOCATMARK: { DWORD ret; diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 3e6faaffa4c..d4f430a29d2 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -5273,6 +5273,55 @@ static void test_get_extension_func(void) closesocket(s); } +static void test_backlog_query(void) +{ + const struct sockaddr_in addr = {.sin_family = AF_INET, .sin_addr.s_addr = htonl(INADDR_LOOPBACK)}; + GUID acceptex_guid = WSAID_ACCEPTEX; + LPFN_ACCEPTEX pAcceptEx; + struct sockaddr_in destaddr; + DWORD size; + SOCKET s, listener; + int len, ret; + ULONG backlog = 0; + + listener = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + ok(listener != -1, "failed to create socket, error %u\n", WSAGetLastError()); + + ret = WSAIoctl(listener, SIO_GET_EXTENSION_FUNCTION_POINTER, &acceptex_guid, sizeof(acceptex_guid), + &pAcceptEx, sizeof(pAcceptEx), &size, NULL, NULL); + ok(!ret, "failed to get AcceptEx, error %u\n", WSAGetLastError()); + + ret = bind(listener, (const struct sockaddr *)&addr, sizeof(addr)); + ok(!ret, "failed to bind, error %u\n", WSAGetLastError()); + len = sizeof(destaddr); + ret = getsockname(listener, (struct sockaddr *)&destaddr, &len); + ok(!ret, "failed to get address, error %u\n", WSAGetLastError()); + ret = listen(listener, 2); + ok(!ret, "failed to listen, error %u\n", WSAGetLastError()); + + s = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + ret = WSAIoctl(s, SIO_IDEAL_SEND_BACKLOG_QUERY, NULL, 0, &backlog, sizeof(backlog), &size, NULL, NULL); + ok(ret == SOCKET_ERROR && WSAGetLastError() == WSAENOTCONN, + "WSAIoctl() failed: %d/%d\n", ret, WSAGetLastError()); + + ret = connect(s, (struct sockaddr *)&destaddr, sizeof(destaddr)); + ok(!ret, "failed to connect, error %u\n", WSAGetLastError()); + ret = WSAIoctl(s, SIO_IDEAL_SEND_BACKLOG_QUERY, NULL, 0, &backlog, sizeof(backlog), &size, NULL, NULL); + ok(!ret, "WSAIoctl() failed: %d\n", WSAGetLastError()); + ok(backlog == 0x10000, "got %08lx\n", backlog); + + closesocket(listener); + closesocket(s); + + s = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP); + + backlog = 0; + ret = WSAIoctl(s, SIO_IDEAL_SEND_BACKLOG_QUERY, NULL, 0, &backlog, sizeof(backlog), &size, NULL, NULL); + ok(ret == SOCKET_ERROR && WSAGetLastError() == WSAEOPNOTSUPP, + "WSAIoctl() failed: %d/%d\n", ret, WSAGetLastError()); + closesocket(s); +} + static void test_base_handle(void) { OVERLAPPED overlapped = {0}, *overlapped_ptr; @@ -13242,6 +13291,7 @@ START_TEST( sock ) test_fionbio(); test_fionread_siocatmark(); test_get_extension_func(); + test_backlog_query(); test_get_interface_list(); test_keepalive_vals(); test_sioRoutingInterfaceQuery();

1 0

← Newer
1
...
23
24
25
26
27
28
29
...
56
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits September 2022