June 2021 - Wine-Commits - list.winehq.org

Rémi Bernon : ntoskrnl.exe/tests: Add some HidP_GetLinkCollectionNodes tests.
by Alexandre Julliard June 10, 2021

June 10, 2021

Module: wine Branch: master Commit: 49f4db5e1af42d422408c30a2340ec344eddb9fc URL: https://source.winehq.org/git/wine.git/?a=commit;h=49f4db5e1af42d422408c30a… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Jun 10 10:06:27 2021 +0200 ntoskrnl.exe/tests: Add some HidP_GetLinkCollectionNodes tests. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 45 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index c931f5a02d0..6a73493aa39 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -1524,6 +1524,20 @@ static inline void check_hidp_caps_(int line, HIDP_CAPS *caps, const HIDP_CAPS * check_member_(__FILE__, line, *caps, *exp, "%d", NumberFeatureDataIndices); } +#define check_hidp_link_collection_node(a, b) check_hidp_link_collection_node_(__LINE__, a, b) +static inline void check_hidp_link_collection_node_(int line, HIDP_LINK_COLLECTION_NODE *node, + const HIDP_LINK_COLLECTION_NODE *exp) +{ + check_member_(__FILE__, line, *node, *exp, "%04x", LinkUsage); + check_member_(__FILE__, line, *node, *exp, "%04x", LinkUsagePage); + check_member_(__FILE__, line, *node, *exp, "%d", Parent); + check_member_(__FILE__, line, *node, *exp, "%d", NumberOfChildren); + check_member_(__FILE__, line, *node, *exp, "%d", NextSibling); + check_member_(__FILE__, line, *node, *exp, "%d", FirstChild); + check_member_(__FILE__, line, *node, *exp, "%d", CollectionType); + check_member_(__FILE__, line, *node, *exp, "%d", IsAlias); +} + #define check_hidp_button_caps(a, b) check_hidp_button_caps_(__LINE__, a, b) static inline void check_hidp_button_caps_(int line, HIDP_BUTTON_CAPS *caps, const HIDP_BUTTON_CAPS *exp) { @@ -1693,10 +1707,20 @@ static void test_hidp(HANDLE file) .NotRange.DataIndex = 10, }, }; + static const HIDP_LINK_COLLECTION_NODE expect_collections[] = + { + { + .LinkUsage = HID_USAGE_GENERIC_JOYSTICK, + .LinkUsagePage = HID_USAGE_PAGE_GENERIC, + .CollectionType = 1, + }, + }; + HIDP_LINK_COLLECTION_NODE collections[16]; PHIDP_PREPARSED_DATA preparsed_data; HIDP_BUTTON_CAPS button_caps[16]; HIDP_VALUE_CAPS value_caps[16]; + DWORD collection_count; char buffer[200]; NTSTATUS status; HIDP_CAPS caps; @@ -1714,6 +1738,27 @@ static void test_hidp(HANDLE file) ok(status == HIDP_STATUS_SUCCESS, "HidP_GetCaps returned %#x\n", status); check_hidp_caps(&caps, &expect_hidp_caps); + collection_count = 0; + status = HidP_GetLinkCollectionNodes(collections, &collection_count, preparsed_data); + ok(status == HIDP_STATUS_BUFFER_TOO_SMALL, "HidP_GetLinkCollectionNodes returned %#x\n", status); + todo_wine + ok(collection_count == caps.NumberLinkCollectionNodes, "got %d collection nodes, expected %d\n", + collection_count, caps.NumberLinkCollectionNodes); + collection_count = ARRAY_SIZE(collections); + status = HidP_GetLinkCollectionNodes(collections, &collection_count, (PHIDP_PREPARSED_DATA)buffer); + ok(status == HIDP_STATUS_INVALID_PREPARSED_DATA, "HidP_GetLinkCollectionNodes returned %#x\n", status); + status = HidP_GetLinkCollectionNodes(collections, &collection_count, preparsed_data); + ok(status == HIDP_STATUS_SUCCESS, "HidP_GetLinkCollectionNodes returned %#x\n", status); + ok(collection_count == caps.NumberLinkCollectionNodes, "got %d collection nodes, expected %d\n", + collection_count, caps.NumberLinkCollectionNodes); + + for (i = 0; i < ARRAY_SIZE(expect_collections); ++i) + { + winetest_push_context("collections[%d]", i); + check_hidp_link_collection_node(collections + i, expect_collections + i); + winetest_pop_context(); + } + count = ARRAY_SIZE(button_caps); status = HidP_GetButtonCaps(HidP_Output, button_caps, &count, preparsed_data); todo_wine

1 0

Zhiyi Zhang : regedit: Enable visual styles.
by Alexandre Julliard June 10, 2021

June 10, 2021

Module: wine Branch: master Commit: f623608f9f4cd5d44eb3dece660fc25a695231ee URL: https://source.winehq.org/git/wine.git/?a=commit;h=f623608f9f4cd5d44eb3dece… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Jun 10 11:04:14 2021 +0800 regedit: Enable visual styles. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/main.c | 2 ++ programs/regedit/regedit.manifest | 16 ++++++++++++++++ programs/regedit/regedit.rc | 3 +++ 3 files changed, 21 insertions(+) diff --git a/programs/regedit/main.c b/programs/regedit/main.c index df92a13ab69..d9f81218acb 100644 --- a/programs/regedit/main.c +++ b/programs/regedit/main.c @@ -142,6 +142,8 @@ int WINAPI wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpCmdLi HACCEL hAccel; BOOL is_wow64; + InitCommonControls(); + if (ProcessCmdLine(GetCommandLineW())) { return 0; } diff --git a/programs/regedit/regedit.manifest b/programs/regedit/regedit.manifest new file mode 100644 index 00000000000..a2c1a437027 --- /dev/null +++ b/programs/regedit/regedit.manifest @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> +<assemblyIdentity type="win32" name="Wine.Regedit" version="0.0.0.0"/> +<dependency> + <dependentAssembly> + <assemblyIdentity + type="win32" + name="Microsoft.Windows.Common-Controls" + version="6.0.0.0" + processorArchitecture="*" + publicKeyToken="6595b64144ccf1df" + language="*" + /> + </dependentAssembly> +</dependency> +</assembly> diff --git a/programs/regedit/regedit.rc b/programs/regedit/regedit.rc index 4e629b7d878..d7dd7c4b49e 100644 --- a/programs/regedit/regedit.rc +++ b/programs/regedit/regedit.rc @@ -434,6 +434,9 @@ STRINGTABLE LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL +/* @makedep: regedit.manifest */ +1 RT_MANIFEST regedit.manifest + /* @makedep: folderopen.ico */ IDI_OPEN_FILE ICON folderopen.ico

1 0

Rémi Bernon : hid: Check preparsed data magic in HidP_GetLinkCollectionNodes.
by Alexandre Julliard June 10, 2021

June 10, 2021

Module: wine Branch: master Commit: dec362a766fbf5d6774dd699b6044841e042f8a5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dec362a766fbf5d6774dd699… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Jun 10 10:06:24 2021 +0200 hid: Check preparsed data magic in HidP_GetLinkCollectionNodes. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hid/hidp.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/hid/hidp.c b/dlls/hid/hidp.c index a7003717a21..2933c2ff7ef 100644 --- a/dlls/hid/hidp.c +++ b/dlls/hid/hidp.c @@ -1001,6 +1001,9 @@ NTSTATUS WINAPI HidP_GetLinkCollectionNodes(HIDP_LINK_COLLECTION_NODE *LinkColle TRACE("(%p, %p, %p)\n", LinkCollectionNode, LinkCollectionNodeLength, PreparsedData); + if (data->magic != HID_MAGIC) + return HIDP_STATUS_INVALID_PREPARSED_DATA; + if (*LinkCollectionNodeLength < data->caps.NumberLinkCollectionNodes) return HIDP_STATUS_BUFFER_TOO_SMALL;

1 0

Zebediah Figura : ws2_32: Use IOCTL_AFD_WINE_COMPLETE_ASYNC in SIO_UDP_CONNRESET.
by Alexandre Julliard June 10, 2021

June 10, 2021

Module: wine Branch: master Commit: e568afa6bd1e8d8a196ec1b59bd26b0794db55a8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e568afa6bd1e8d8a196ec1b5… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jun 10 12:36:38 2021 -0500 ws2_32: Use IOCTL_AFD_WINE_COMPLETE_ASYNC in SIO_UDP_CONNRESET. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 98 +++++++--------------------------------------------- 1 file changed, 13 insertions(+), 85 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 5f0d712f5b7..843ec5ba3ab 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -473,8 +473,6 @@ static int ws_protocol_info(SOCKET s, int unicode, WSAPROTOCOL_INFOW *buffer, in int WSAIOCTL_GetInterfaceCount(void); int WSAIOCTL_GetInterfaceName(int intNumber, char *intName); -static void WS_AddCompletion( SOCKET sock, ULONG_PTR CompletionValue, NTSTATUS CompletionStatus, ULONG Information, BOOL force ); - #define MAP_OPTION(opt) { WS_##opt, opt } static const int ws_sock_map[][2] = @@ -646,45 +644,6 @@ static UINT wsaErrno(void) return sock_get_error( loc_errno ); } -static NTSTATUS sock_error_to_ntstatus( DWORD err ) -{ - switch (err) - { - case 0: return STATUS_SUCCESS; - case WSAEBADF: return STATUS_INVALID_HANDLE; - case WSAEACCES: return STATUS_ACCESS_DENIED; - case WSAEFAULT: return STATUS_ACCESS_VIOLATION; - case WSAEINVAL: return STATUS_INVALID_PARAMETER; - case WSAEMFILE: return STATUS_TOO_MANY_OPENED_FILES; - case WSAEINPROGRESS: - case WSAEWOULDBLOCK: return STATUS_DEVICE_NOT_READY; - case WSAEALREADY: return STATUS_NETWORK_BUSY; - case WSAENOTSOCK: return STATUS_OBJECT_TYPE_MISMATCH; - case WSAEDESTADDRREQ: return STATUS_INVALID_PARAMETER; - case WSAEMSGSIZE: return STATUS_BUFFER_OVERFLOW; - case WSAEPROTONOSUPPORT: - case WSAESOCKTNOSUPPORT: - case WSAEPFNOSUPPORT: - case WSAEAFNOSUPPORT: - case WSAEPROTOTYPE: return STATUS_NOT_SUPPORTED; - case WSAENOPROTOOPT: return STATUS_INVALID_PARAMETER; - case WSAEOPNOTSUPP: return STATUS_NOT_SUPPORTED; - case WSAEADDRINUSE: return STATUS_SHARING_VIOLATION; - case WSAEADDRNOTAVAIL: return STATUS_INVALID_PARAMETER; - case WSAECONNREFUSED: return STATUS_CONNECTION_REFUSED; - case WSAESHUTDOWN: return STATUS_PIPE_DISCONNECTED; - case WSAENOTCONN: return STATUS_INVALID_CONNECTION; - case WSAETIMEDOUT: return STATUS_IO_TIMEOUT; - case WSAENETUNREACH: return STATUS_NETWORK_UNREACHABLE; - case WSAENETDOWN: return STATUS_NETWORK_BUSY; - case WSAECONNRESET: return STATUS_CONNECTION_RESET; - case WSAECONNABORTED: return STATUS_CONNECTION_ABORTED; - default: - FIXME("unmapped error %u\n", err); - return STATUS_UNSUCCESSFUL; - } -} - static DWORD NtStatusToWSAError( NTSTATUS status ) { static const struct @@ -3224,8 +3183,6 @@ INT WINAPI WSAIoctl(SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size, LPVOID DWORD out_size, LPDWORD ret_size, LPWSAOVERLAPPED overlapped, LPWSAOVERLAPPED_COMPLETION_ROUTINE completion ) { - DWORD status = 0, total = 0; - TRACE("%04lx, %s, %p, %d, %p, %d, %p, %p, %p\n", s, debugstr_wsaioctl(code), in_buff, in_size, out_buff, out_size, ret_size, overlapped, completion); @@ -3290,7 +3247,7 @@ INT WINAPI WSAIoctl(SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size, LPVOID case WS_SIO_ADDRESS_LIST_QUERY: { - DWORD size; + DWORD size, total; TRACE("-> SIO_ADDRESS_LIST_QUERY request\n"); @@ -3483,10 +3440,6 @@ INT WINAPI WSAIoctl(SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size, LPVOID return ret ? -1 : 0; } - case WS_SIO_UDP_CONNRESET: - FIXME("WS_SIO_UDP_CONNRESET stub\n"); - break; - case WS_SIO_ADDRESS_LIST_CHANGE: { int force_async = !!overlapped; @@ -3498,6 +3451,18 @@ INT WINAPI WSAIoctl(SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size, LPVOID return ret ? -1 : 0; } + case WS_SIO_UDP_CONNRESET: + { + NTSTATUS status = STATUS_SUCCESS; + DWORD ret; + + FIXME( "WS_SIO_UDP_CONNRESET 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; + } + default: FIXME( "unimplemented ioctl %s\n", debugstr_wsaioctl( code ) ); /* fall through */ @@ -3520,27 +3485,6 @@ INT WINAPI WSAIoctl(SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size, LPVOID return -1; } } - - if (completion) - { - FIXME( "completion routine %p not supported\n", completion ); - } - else if (overlapped) - { - ULONG_PTR cvalue = (overlapped && ((ULONG_PTR)overlapped->hEvent & 1) == 0) ? (ULONG_PTR)overlapped : 0; - overlapped->Internal = sock_error_to_ntstatus( status ); - overlapped->InternalHigh = total; - if (cvalue) WS_AddCompletion( HANDLE2SOCKET(s), cvalue, overlapped->Internal, total, FALSE ); - if (overlapped->hEvent) NtSetEvent( overlapped->hEvent, NULL ); - } - - if (!status) - { - *ret_size = total; - return 0; - } - SetLastError( status ); - return SOCKET_ERROR; } @@ -3922,22 +3866,6 @@ int WINAPI WSAPoll(WSAPOLLFD *wfds, ULONG count, int timeout) return ret; } -/* helper to send completion messages for client-only i/o operation case */ -static void WS_AddCompletion( SOCKET sock, ULONG_PTR CompletionValue, NTSTATUS CompletionStatus, - ULONG Information, BOOL async ) -{ - SERVER_START_REQ( add_fd_completion ) - { - req->handle = wine_server_obj_handle( SOCKET2HANDLE(sock) ); - req->cvalue = CompletionValue; - req->status = CompletionStatus; - req->information = Information; - req->async = async; - wine_server_call( req ); - } - SERVER_END_REQ; -} - /*********************************************************************** * send (WS2_32.19)

1 0

Zebediah Figura : ws2_32: Implement SIO_BASE_HANDLE.
by Alexandre Julliard June 10, 2021

June 10, 2021

Module: wine Branch: master Commit: 8698083dd05a375615a772fa83a6b26747a40708 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8698083dd05a375615a772fa… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jun 10 12:36:39 2021 -0500 ws2_32: Implement SIO_BASE_HANDLE. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50520 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 22 ++++++++++++ dlls/ws2_32/tests/sock.c | 92 ++++++++++++++++++++++++++++++++++++++++++++++++ include/mswsock.h | 10 +++--- 3 files changed, 120 insertions(+), 4 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 843ec5ba3ab..f4e3a6c9e43 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3463,6 +3463,28 @@ INT WINAPI WSAIoctl(SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size, LPVOID return ret ? -1 : 0; } + case WS_SIO_BASE_HANDLE: + { + NTSTATUS status; + DWORD ret; + + if (overlapped) + { + status = STATUS_NOT_SUPPORTED; + } + else + { + status = STATUS_SUCCESS; + *(SOCKET *)out_buff = s; + } + ret = server_ioctl_sock( s, IOCTL_AFD_WINE_COMPLETE_ASYNC, &status, sizeof(status), + NULL, 0, ret_size, overlapped, completion ); + if (overlapped) ret = ERROR_IO_PENDING; + if (!ret) *ret_size = sizeof(SOCKET); + SetLastError( ret ); + return ret ? -1 : 0; + } + default: FIXME( "unimplemented ioctl %s\n", debugstr_wsaioctl( code ) ); /* fall through */ diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index d581b1df6c1..76d0a3f3b19 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -4275,6 +4275,97 @@ static void test_get_extension_func(void) closesocket(s); } +static void test_base_handle(void) +{ + OVERLAPPED overlapped = {0}, *overlapped_ptr; + unsigned int i; + SOCKET s, base; + ULONG_PTR key; + HANDLE port; + DWORD size; + int ret; + + static const struct + { + int family, type, protocol; + } + tests[] = + { + {AF_INET, SOCK_STREAM, IPPROTO_TCP}, + {AF_INET, SOCK_DGRAM, IPPROTO_UDP}, + {AF_INET6, SOCK_STREAM, IPPROTO_TCP}, + {AF_INET6, SOCK_DGRAM, IPPROTO_UDP}, + }; + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + s = socket(tests[i].family, tests[i].type, tests[i].protocol); + if (s == INVALID_SOCKET) continue; + port = CreateIoCompletionPort((HANDLE)s, NULL, 123, 0); + + WSASetLastError(0xdeadbeef); + ret = WSAIoctl(s, SIO_BASE_HANDLE, NULL, 0, &base, sizeof(base), NULL, &overlapped, NULL); + ok(ret == -1, "expected failure\n"); + ok(WSAGetLastError() == WSAEFAULT, "got error %u\n", WSAGetLastError()); + + WSASetLastError(0xdeadbeef); + size = 0xdeadbeef; + base = 0xdeadbeef; + ret = WSAIoctl(s, SIO_BASE_HANDLE, NULL, 0, &base, sizeof(base), &size, NULL, NULL); + ok(!ret, "expected success\n"); + ok(!WSAGetLastError(), "got error %u\n", WSAGetLastError()); + ok(size == sizeof(base), "got size %u\n", size); + ok(base == s, "expected %#Ix, got %#Ix\n", s, base); + + WSASetLastError(0xdeadbeef); + size = 0xdeadbeef; + base = 0xdeadbeef; + overlapped.Internal = 0xdeadbeef; + overlapped.InternalHigh = 0xdeadbeef; + ret = WSAIoctl(s, SIO_BASE_HANDLE, NULL, 0, &base, sizeof(base), &size, &overlapped, NULL); + ok(ret == -1, "expected failure\n"); + ok(WSAGetLastError() == ERROR_IO_PENDING, "got error %u\n", WSAGetLastError()); + ok(size == 0xdeadbeef, "got size %u\n", size); + + ret = GetQueuedCompletionStatus(port, &size, &key, &overlapped_ptr, 0); + ok(!ret, "expected failure\n"); + ok(GetLastError() == ERROR_NOT_SUPPORTED, "got error %u\n", GetLastError()); + ok(!size, "got size %u\n", size); + ok(key == 123, "got key %Iu\n", key); + ok(overlapped_ptr == &overlapped, "got overlapped %p\n", overlapped_ptr); + ok((NTSTATUS)overlapped.Internal == STATUS_NOT_SUPPORTED, "got status %#x\n", (NTSTATUS)overlapped.Internal); + ok(!overlapped.InternalHigh, "got size %Iu\n", overlapped.InternalHigh); + ok(base == 0xdeadbeef, "expected %#Ix, got %#Ix\n", s, base); + + CloseHandle(port); + closesocket(s); + + s = socket(tests[i].family, tests[i].type, tests[i].protocol); + + ret = WSAIoctl(s, SIO_BASE_HANDLE, NULL, 0, &base, sizeof(base), NULL, &overlapped, socket_apc); + ok(ret == -1, "expected failure\n"); + ok(WSAGetLastError() == WSAEFAULT, "got error %u\n", WSAGetLastError()); + + apc_count = 0; + size = 0xdeadbeef; + base = 0xdeadbeef; + ret = WSAIoctl(s, SIO_BASE_HANDLE, NULL, 0, &base, sizeof(base), &size, &overlapped, socket_apc); + ok(ret == -1, "expected failure\n"); + ok(WSAGetLastError() == ERROR_IO_PENDING, "got error %u\n", WSAGetLastError()); + ok(size == 0xdeadbeef, "got size %u\n", size); + + ret = SleepEx(0, TRUE); + ok(ret == WAIT_IO_COMPLETION, "got %d\n", ret); + ok(apc_count == 1, "APC was called %u times\n", apc_count); + ok(apc_error == WSAEOPNOTSUPP, "got APC error %u\n", apc_error); + ok(!apc_size, "got APC size %u\n", apc_size); + ok(apc_overlapped == &overlapped, "got APC overlapped %p\n", apc_overlapped); + ok(base == 0xdeadbeef, "expected %#Ix, got %#Ix\n", s, base); + + closesocket(s); + } +} + static BOOL drain_pause = FALSE; static DWORD WINAPI drain_socket_thread(LPVOID arg) { @@ -10837,6 +10928,7 @@ START_TEST( sock ) test_keepalive_vals(); test_sioRoutingInterfaceQuery(); test_sioAddressListChange(); + test_base_handle(); test_unsupported_ioctls(); test_WSASendMsg(); diff --git a/include/mswsock.h b/include/mswsock.h index e402f33ecf7..fa97d5bf04d 100644 --- a/include/mswsock.h +++ b/include/mswsock.h @@ -83,11 +83,13 @@ extern "C" { #endif #ifndef USE_WS_PREFIX -#define SIO_UDP_CONNRESET _WSAIOW(IOC_VENDOR,12) -#define SIO_SET_COMPATIBILITY_MODE _WSAIOW(IOC_VENDOR,300) +#define SIO_UDP_CONNRESET _WSAIOW(IOC_VENDOR, 12) +#define SIO_SET_COMPATIBILITY_MODE _WSAIOW(IOC_VENDOR, 300) +#define SIO_BASE_HANDLE _WSAIOR(IOC_WS2, 34) #else -#define WS_SIO_UDP_CONNRESET _WSAIOW(WS_IOC_VENDOR,12) -#define WS_SIO_SET_COMPATIBILITY_MODE _WSAIOW(WS_IOC_VENDOR,300) +#define WS_SIO_UDP_CONNRESET _WSAIOW(WS_IOC_VENDOR, 12) +#define WS_SIO_SET_COMPATIBILITY_MODE _WSAIOW(WS_IOC_VENDOR, 300) +#define WS_SIO_BASE_HANDLE _WSAIOR(WS_IOC_WS2, 34) #endif #define DE_REUSE_SOCKET TF_REUSE_SOCKET

1 0

Francois Gouget : wined3d: Avoid an unneeded NULL cast.
by Alexandre Julliard June 10, 2021

June 10, 2021

Module: wine Branch: master Commit: 2fb789f5c65e9bc7e357518258aee14933fc989a URL: https://source.winehq.org/git/wine.git/?a=commit;h=2fb789f5c65e9bc7e3575182… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Jun 10 14:27:03 2021 +0200 wined3d: Avoid an unneeded NULL cast. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index c7a9b4da3e1..c77de1796c4 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -5013,7 +5013,7 @@ static void wined3d_texture_vk_download_data(struct wined3d_context *context, wined3d_context_vk_wait_command_buffer(context_vk, src_texture_vk->image.command_buffer_id); staging_bo_addr.buffer_object = (uintptr_t)&staging_bo; - staging_bo_addr.addr = (uint8_t *)NULL; + staging_bo_addr.addr = NULL; if (!(map_ptr = wined3d_context_map_bo_address(context, &staging_bo_addr, sub_resource->size, WINED3D_MAP_READ))) {

1 0

Ziqing Hui : d3dx10/tests: Check more members of texture descriptor.
by Alexandre Julliard June 10, 2021

June 10, 2021

Module: wine Branch: master Commit: 6161571a7228be7f2ac23bac4929956926d63720 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6161571a7228be7f2ac23bac… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Mon Jun 7 14:57:22 2021 +0800 d3dx10/tests: Check more members of texture descriptor. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx10_43/tests/d3dx10.c | 29 +++++++++++++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx10_43/tests/d3dx10.c b/dlls/d3dx10_43/tests/d3dx10.c index b0800d26407..235c60ebf7e 100644 --- a/dlls/d3dx10_43/tests/d3dx10.c +++ b/dlls/d3dx10_43/tests/d3dx10.c @@ -767,9 +767,25 @@ static void check_resource_info(ID3D10Resource *resource, unsigned int i, unsign ok_(__FILE__, line)(desc_2d.Format == test_image[i].expected.Format, "Test %u: Got unexpected Format %u, expected %u.\n", i, desc_2d.Format, test_image[i].expected.Format); + ok_(__FILE__, line)(desc_2d.SampleDesc.Count == 1, + "Test %u: Got unexpected SampleDesc.Count %u, expected %u\n", + i, desc_2d.SampleDesc.Count, 1); + ok_(__FILE__, line)(desc_2d.SampleDesc.Quality == 0, + "Test %u: Got unexpected SampleDesc.Quality %u, expected %u\n", + i, desc_2d.SampleDesc.Quality, 0); + ok_(__FILE__, line)(desc_2d.Usage == D3D10_USAGE_DEFAULT, + "Test %u: Got unexpected Usage %u, expected %u\n", + i, desc_2d.Usage, D3D10_USAGE_DEFAULT); + ok_(__FILE__, line)(desc_2d.BindFlags == D3D10_BIND_SHADER_RESOURCE, + "Test %u: Got unexpected BindFlags %#x, expected %#x\n", + i, desc_2d.BindFlags, D3D10_BIND_SHADER_RESOURCE); + ok_(__FILE__, line)(desc_2d.CPUAccessFlags == 0, + "Test %u: Got unexpected CPUAccessFlags %#x, expected %#x\n", + i, desc_2d.CPUAccessFlags, 0); ok_(__FILE__, line)(desc_2d.MiscFlags == test_image[i].expected.MiscFlags, - "Test %u: Got unexpected MiscFlags %u, expected %u.\n", + "Test %u: Got unexpected MiscFlags %#x, expected %#x.\n", i, desc_2d.MiscFlags, test_image[i].expected.MiscFlags); + ID3D10Texture2D_Release(texture_2d); break; @@ -792,8 +808,17 @@ static void check_resource_info(ID3D10Resource *resource, unsigned int i, unsign ok_(__FILE__, line)(desc_3d.Format == test_image[i].expected.Format, "Test %u: Got unexpected Format %u, expected %u.\n", i, desc_3d.Format, test_image[i].expected.Format); + ok_(__FILE__, line)(desc_3d.Usage == D3D10_USAGE_DEFAULT, + "Test %u: Got unexpected Usage %u, expected %u\n", + i, desc_3d.Usage, D3D10_USAGE_DEFAULT); + ok_(__FILE__, line)(desc_3d.BindFlags == D3D10_BIND_SHADER_RESOURCE, + "Test %u: Got unexpected BindFlags %#x, expected %#x\n", + i, desc_3d.BindFlags, D3D10_BIND_SHADER_RESOURCE); + ok_(__FILE__, line)(desc_3d.CPUAccessFlags == 0, + "Test %u: Got unexpected CPUAccessFlags %#x, expected %#x\n", + i, desc_3d.CPUAccessFlags, 0); ok_(__FILE__, line)(desc_3d.MiscFlags == test_image[i].expected.MiscFlags, - "Test %u: Got unexpected MiscFlags %u, expected %u.\n", + "Test %u: Got unexpected MiscFlags %#x, expected %#x.\n", i, desc_3d.MiscFlags, test_image[i].expected.MiscFlags); ID3D10Texture3D_Release(texture_3d); break;

1 0

Nikolay Sivov : d3d11: Fix freed memory access when releasing device context (Coverity).
by Alexandre Julliard June 10, 2021

June 10, 2021

Module: wine Branch: master Commit: d26275f9053f46b71c6325cc1cade0c7cc5921dd URL: https://source.winehq.org/git/wine.git/?a=commit;h=d26275f9053f46b71c6325cc… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jun 9 08:57:00 2021 +0300 d3d11: Fix freed memory access when releasing device context (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index d3e49879676..56f34c70ea1 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -521,13 +521,14 @@ static ULONG STDMETHODCALLTYPE d3d11_device_context_Release(ID3D11DeviceContext1 if (!refcount) { + ID3D11Device2 *device = &context->device->ID3D11Device2_iface; if (context->type != D3D11_DEVICE_CONTEXT_IMMEDIATE) { wined3d_deferred_context_destroy(context->wined3d_context); d3d11_device_context_cleanup(context); heap_free(context); } - ID3D11Device2_Release(&context->device->ID3D11Device2_iface); + ID3D11Device2_Release(device); } return refcount;

1 0

Nikolay Sivov : d2d1: Reuse PS constant buffer object.
by Alexandre Julliard June 10, 2021

June 10, 2021

Module: wine Branch: master Commit: f74163ad583303606ff6ef4caa54eba0f685c506 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f74163ad583303606ff6ef4c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jun 10 15:13:23 2021 +0300 d2d1: Reuse PS constant buffer object. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/brush.c | 33 +----------- dlls/d2d1/d2d1_private.h | 4 +- dlls/d2d1/device.c | 133 +++++++++++++++++++++++++++-------------------- 3 files changed, 80 insertions(+), 90 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f74163ad583303606ff6…

1 0

Nikolay Sivov : d2d1: Remove unused argument from constant buffer initialization helper.
by Alexandre Julliard June 10, 2021

June 10, 2021

Module: wine Branch: master Commit: 140c4a094a4f4007fd56e6d0f6286280e5c08c36 URL: https://source.winehq.org/git/wine.git/?a=commit;h=140c4a094a4f4007fd56e6d0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jun 10 15:13:22 2021 +0300 d2d1: Remove unused argument from constant buffer initialization helper. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/brush.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/d2d1/brush.c b/dlls/d2d1/brush.c index 76276bafc7a..94ed95337f4 100644 --- a/dlls/d2d1/brush.c +++ b/dlls/d2d1/brush.c @@ -1122,8 +1122,7 @@ static D3D10_TEXTURE_ADDRESS_MODE texture_address_mode_from_extend_mode(D2D1_EXT } } -static BOOL d2d_brush_fill_cb(const struct d2d_brush *brush, - const struct d2d_device_context *render_target, struct d2d_brush_cb *cb) +static BOOL d2d_brush_fill_cb(const struct d2d_brush *brush, struct d2d_brush_cb *cb) { float theta, sin_theta, cos_theta; float dpi_scale, d, s1, s2, t, u; @@ -1249,9 +1248,9 @@ HRESULT d2d_brush_get_ps_cb(struct d2d_brush *brush, struct d2d_brush *opacity_b cb_data.outline = outline; cb_data.is_arc = is_arc; - if (!d2d_brush_fill_cb(brush, render_target, &cb_data.colour_brush)) + if (!d2d_brush_fill_cb(brush, &cb_data.colour_brush)) return E_NOTIMPL; - if (!d2d_brush_fill_cb(opacity_brush, render_target, &cb_data.opacity_brush)) + if (!d2d_brush_fill_cb(opacity_brush, &cb_data.opacity_brush)) return E_NOTIMPL; buffer_desc.ByteWidth = sizeof(cb_data);

1 0