- Wine-Devel - list.winehq.org

[PATCH v2] ws2_32: Add stub for SIO_ENABLE_CIRCULAR_QUEUEING in WSAIoctl()
by Julian Klemann May 20, 2022

May 20, 2022

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47233 Signed-off-by: Julian Klemann <jklemann(a)codeweavers.com> --- v2: Changed tabs to spaces in sock.c --- dlls/ws2_32/socket.c | 12 ++++++++++++ dlls/ws2_32/tests/sock.c | 14 ++++++++++++++ 2 files changed, 26 insertions(+) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 3d0c2deca35..88089fa8d74 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2371,6 +2371,18 @@ INT WINAPI WSAIoctl(SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size, LPVOID return ret ? -1 : 0; } + case SIO_ENABLE_CIRCULAR_QUEUEING: + { + NTSTATUS status = STATUS_SUCCESS; + DWORD ret; + + FIXME( "SIO_ENABLE_CIRCULAR_QUEUEING stub\n" ); + ret = server_ioctl_sock( s, IOCTL_AFD_WINE_COMPLETE_ASYNC, &status, sizeof(status), + NULL, 0, ret_size, overlapped, completion ); + SetLastError( ret ); + return ret ? -1 : 0; + } + case SIO_BASE_HANDLE: { NTSTATUS status; diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index f17ffba7a85..bdb683e6796 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -5113,6 +5113,19 @@ static void test_base_handle(void) } } +static void test_circular_queueing(void) +{ + SOCKET s; + DWORD size; + int ret; + + s = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP); + ret = WSAIoctl(s, SIO_ENABLE_CIRCULAR_QUEUEING, NULL, 0, NULL, 0, &size, NULL, NULL); + ok(!ret, "expected 0, got %d\n", ret); + + closesocket(s); +} + static BOOL drain_pause = FALSE; static DWORD WINAPI drain_socket_thread(LPVOID arg) { @@ -12578,6 +12591,7 @@ START_TEST( sock ) test_sioRoutingInterfaceQuery(); test_sioAddressListChange(); test_base_handle(); + test_circular_queueing(); test_unsupported_ioctls(); test_WSASendMsg(); -- 2.36.1

2 1

[PATCH v2 0/4] MR98: Some registry access fixes
by Torge Matthies (＠tmatthies) May 19, 2022

May 19, 2022

I had these in my patch repo for quite a while. Patch 1 shouldn't need explanation. The problem fixed by patch 2 and 3 is that sizeof(KEY_{BASIC,VALUE_PARTIAL,FULL}_INFORMATION) are all slightly bigger than the actual minimum size required to get all the requested info, because those structs include an array of size 1 as their last member, which is intended to be a variable length array. Fixing these size calculations removes one allocation in wineserver and reduces the amount of data transmitted by 1 - 2 bytes. Patch 4 just reduces the amount of data transmitted from wineserver for each update_display_cache_from_registry call, which is called every time the display device lists are locked. -- v2: win32u: Query basic instead of full key information to get the LastWriteTime. win32u: Calculate buffer sizes from registry structs correctly. ntdll: Calculate buffer sizes from registry structs correctly. ntdll: Use correct output buffer size in RtlpNtEnumerateSubKey. https://gitlab.winehq.org/wine/wine/-/merge_requests/98

2 4

[PATCH v2 0/11] MR79: wined3d: Refactor format flags into two groups.
by Chip Davis (＠cdavis5e) May 19, 2022

May 19, 2022

There are only three unused format flags left. I will soon submit changes which add four more format flags. I've noticed that format flags generally fall into two groups: * The first group consists of flags describing the content of a pixel format, e.g. whether or not this is a depth format, or whether this is a blocked format. These flags are the same for all resource types. * The second group consists of flags describing capabilities of the implementation with this format. These can and do vary by resource type. Only the second group needs to be stored per-resource-type. -- v2: wined3d: Rename format base_flags to flags. wined3d: Rename format flags to caps. wined3d: Move WINED3DFMT_FLAG_CAST_TO_BLOCK to the base flags group. wined3d: Move WINED3DFMT_FLAG_MAPPABLE to the base flags group. wined3d: Move WINED3DFMT_FLAG_COMPRESSED and HEIGHT_SCALE to the base flags group. wined3d: Move WINED3DFMT_FLAG_BLOCKS, BROKEN_PITCH, and BLOCKS_NO_VERIFY to the base flag group. wined3d: Move WINED3DFMT_FLAG_EXTENSION to the base flags group. wined3d: Move WINED3DFMT_FLAG_BUMPMAP to the base flags group. wined3d: Move WINED3DFMT_FLAG_NORMALISED to the base flags group. wined3d: Move WINED3DFMT_FLAG_INTEGER to the base flags group. wined3d: Move WINED3DFMT_FLAG_FLOAT to a separate group. https://gitlab.winehq.org/wine/wine/-/merge_requests/79

4 18

Re: [PATCH v2 0/1] MR90: ntdll: Implement idle time query for Mac OS. - approved
by Alexandre Julliard (＠julliard) May 19, 2022

May 19, 2022

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/90

1 0

Re: [PATCH v2 0/6] MR97: win32u: user32 conversion - approved
by Alexandre Julliard (＠julliard) May 19, 2022

May 19, 2022

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/97

1 0

Re: [PATCH v2 0/4] MR91: d3drm: IDirect3DRMMeshBuilder2 Get/SetQuality - approved
by Alexandre Julliard (＠julliard) May 19, 2022

May 19, 2022

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/91

1 0

Re: [PATCH v2 0/4] MR94: windows.gaming.input: More force feedback effect support. - approved
by Alexandre Julliard (＠julliard) May 19, 2022

May 19, 2022

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/94

1 0

Re: [PATCH v2 0/6] MR96: windows.media.speech: Tests and some refactoring. - approved
by Alexandre Julliard (＠julliard) May 19, 2022

May 19, 2022

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/96

1 0

[PATCH v4 0/1] MR21: include/guiddef.h: use Mingw64's __uuidof when present
by eric pouech (＠epo) May 19, 2022

May 19, 2022

otherwise Wine's and Mingw64's __uuidof() enter in conflict (C++) Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> -- v4: include: Use Mingw64's __uuidof when present. https://gitlab.winehq.org/wine/wine/-/merge_requests/21

3 2

Re: [PATCH v2 0/6] MR93: ntdll: More heap code cleanup. - approved
by Alexandre Julliard (＠julliard) May 19, 2022

May 19, 2022

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/93

1 0