September 2020 - Wine-Commits

Zebediah Figura : ws2_32: Reimplement ws_protocol_info() using the supported_protocols array.
by Alexandre Julliard Sept. 29, 2020

Sept. 29, 2020

Module: wine Branch: master Commit: 0c2f556afe7b5fcc873c737512fae5b9c8c07624 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0c2f556afe7b5fcc873c7375… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Sep 28 22:35:05 2020 -0500 ws2_32: Reimplement ws_protocol_info() using the supported_protocols array. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 183 +++++++-------------------------------------------- 1 file changed, 23 insertions(+), 160 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 2ba74cdb19..36215cc6ef 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -185,21 +185,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(winsock); WINE_DECLARE_DEBUG_CHANNEL(winediag); -/* names of the protocols */ -static const WCHAR NameIpxW[] = {'I', 'P', 'X', '\0'}; -static const WCHAR NameSpxW[] = {'S', 'P', 'X', '\0'}; -static const WCHAR NameSpxIIW[] = {'S', 'P', 'X', ' ', 'I', 'I', '\0'}; -static const WCHAR NameTcpW[] = {'T', 'C', 'P', '/', 'I', 'P', '\0'}; -static const WCHAR NameUdpW[] = {'U', 'D', 'P', '/', 'I', 'P', '\0'}; - -/* Taken from Win2k */ -static const GUID ProviderIdIP = { 0xe70f1aa0, 0xab8b, 0x11cf, - { 0x8c, 0xa3, 0x00, 0x80, 0x5f, 0x48, 0xa1, 0x92 } }; -static const GUID ProviderIdIPX = { 0x11058240, 0xbe47, 0x11cf, - { 0x95, 0xc8, 0x00, 0x80, 0x5f, 0x48, 0xa1, 0x92 } }; -static const GUID ProviderIdSPX = { 0x11058241, 0xbe47, 0x11cf, - { 0x95, 0xc8, 0x00, 0x80, 0x5f, 0x48, 0xa1, 0x92 } }; - static const WSAPROTOCOL_INFOW supported_protocols[] = { { @@ -2304,149 +2289,13 @@ static INT WS_DuplicateSocket(BOOL unicode, SOCKET s, DWORD dwProcessId, LPWSAPR return 0; } -/***************************************************************************** - * WS_EnterSingleProtocolW [internal] - * - * enters the protocol information of one given protocol into the given - * buffer. - * - * RETURNS - * TRUE if a protocol was entered into the buffer. - * - * BUGS - * - only implemented for IPX, SPX, SPXII, TCP, UDP - * - there is no check that the operating system supports the returned - * protocols - */ -static BOOL WS_EnterSingleProtocolW( INT protocol, WSAPROTOCOL_INFOW* info ) -{ - memset( info, 0, sizeof(WSAPROTOCOL_INFOW) ); - info->iProtocol = protocol; - - switch (protocol) - { - case WS_IPPROTO_TCP: - info->dwServiceFlags1 = XP1_IFS_HANDLES | XP1_EXPEDITED_DATA | - XP1_GRACEFUL_CLOSE | XP1_GUARANTEED_ORDER | - XP1_GUARANTEED_DELIVERY; - info->ProviderId = ProviderIdIP; - info->dwCatalogEntryId = 0x3e9; - info->dwProviderFlags = PFL_MATCHES_PROTOCOL_ZERO; - info->ProtocolChain.ChainLen = 1; - info->iVersion = 2; - info->iAddressFamily = WS_AF_INET; - info->iMaxSockAddr = 0x10; - info->iMinSockAddr = 0x10; - info->iSocketType = WS_SOCK_STREAM; - strcpyW( info->szProtocol, NameTcpW ); - break; - - case WS_IPPROTO_UDP: - info->dwServiceFlags1 = XP1_IFS_HANDLES | XP1_SUPPORT_BROADCAST | - XP1_SUPPORT_MULTIPOINT | XP1_MESSAGE_ORIENTED | - XP1_CONNECTIONLESS; - info->ProviderId = ProviderIdIP; - info->dwCatalogEntryId = 0x3ea; - info->dwProviderFlags = PFL_MATCHES_PROTOCOL_ZERO; - info->ProtocolChain.ChainLen = 1; - info->iVersion = 2; - info->iAddressFamily = WS_AF_INET; - info->iMaxSockAddr = 0x10; - info->iMinSockAddr = 0x10; - info->iSocketType = WS_SOCK_DGRAM; - info->dwMessageSize = 0xffbb; - strcpyW( info->szProtocol, NameUdpW ); - break; - - case WS_NSPROTO_IPX: - info->dwServiceFlags1 = XP1_PARTIAL_MESSAGE | XP1_SUPPORT_BROADCAST | - XP1_SUPPORT_MULTIPOINT | XP1_MESSAGE_ORIENTED | - XP1_CONNECTIONLESS; - info->ProviderId = ProviderIdIPX; - info->dwCatalogEntryId = 0x406; - info->dwProviderFlags = PFL_MATCHES_PROTOCOL_ZERO; - info->ProtocolChain.ChainLen = 1; - info->iVersion = 2; - info->iAddressFamily = WS_AF_IPX; - info->iMaxSockAddr = 0x10; - info->iMinSockAddr = 0x0e; - info->iSocketType = WS_SOCK_DGRAM; - info->iProtocolMaxOffset = 0xff; - info->dwMessageSize = 0x240; - strcpyW( info->szProtocol, NameIpxW ); - break; - - case WS_NSPROTO_SPX: - info->dwServiceFlags1 = XP1_IFS_HANDLES | XP1_PSEUDO_STREAM | - XP1_MESSAGE_ORIENTED | XP1_GUARANTEED_ORDER | - XP1_GUARANTEED_DELIVERY; - info->ProviderId = ProviderIdSPX; - info->dwCatalogEntryId = 0x407; - info->dwProviderFlags = PFL_MATCHES_PROTOCOL_ZERO; - info->ProtocolChain.ChainLen = 1; - info->iVersion = 2; - info->iAddressFamily = WS_AF_IPX; - info->iMaxSockAddr = 0x10; - info->iMinSockAddr = 0x0e; - info->iSocketType = WS_SOCK_SEQPACKET; - info->dwMessageSize = 0xffffffff; - strcpyW( info->szProtocol, NameSpxW ); - break; - - case WS_NSPROTO_SPXII: - info->dwServiceFlags1 = XP1_IFS_HANDLES | XP1_GRACEFUL_CLOSE | - XP1_PSEUDO_STREAM | XP1_MESSAGE_ORIENTED | - XP1_GUARANTEED_ORDER | XP1_GUARANTEED_DELIVERY; - info->ProviderId = ProviderIdSPX; - info->dwCatalogEntryId = 0x409; - info->dwProviderFlags = PFL_MATCHES_PROTOCOL_ZERO; - info->ProtocolChain.ChainLen = 1; - info->iVersion = 2; - info->iAddressFamily = WS_AF_IPX; - info->iMaxSockAddr = 0x10; - info->iMinSockAddr = 0x0e; - info->iSocketType = WS_SOCK_SEQPACKET; - info->dwMessageSize = 0xffffffff; - strcpyW( info->szProtocol, NameSpxIIW ); - break; - - default: - FIXME("unknown Protocol <0x%08x>\n", protocol); - return FALSE; - } - return TRUE; -} - -/***************************************************************************** - * WS_EnterSingleProtocolA [internal] - * - * see function WS_EnterSingleProtocolW - * - */ -static BOOL WS_EnterSingleProtocolA( INT protocol, WSAPROTOCOL_INFOA* info ) -{ - WSAPROTOCOL_INFOW infow; - INT ret; - memset( info, 0, sizeof(WSAPROTOCOL_INFOA) ); - - ret = WS_EnterSingleProtocolW( protocol, &infow ); - if (ret) - { - /* convert the structure from W to A */ - memcpy( info, &infow, FIELD_OFFSET( WSAPROTOCOL_INFOA, szProtocol ) ); - WideCharToMultiByte( CP_ACP, 0, infow.szProtocol, -1, - info->szProtocol, WSAPROTOCOL_LEN+1, NULL, NULL ); - } - - return ret; -} - static BOOL ws_protocol_info(SOCKET s, int unicode, WSAPROTOCOL_INFOW *buffer, int *size) { NTSTATUS status; int address_family; int socket_type; int protocol; + unsigned int i; *size = unicode ? sizeof(WSAPROTOCOL_INFOW) : sizeof(WSAPROTOCOL_INFOA); memset(buffer, 0, *size); @@ -2471,14 +2320,28 @@ static BOOL ws_protocol_info(SOCKET s, int unicode, WSAPROTOCOL_INFOW *buffer, i return FALSE; } - if (unicode) - WS_EnterSingleProtocolW( protocol, buffer); - else - WS_EnterSingleProtocolA( protocol, (WSAPROTOCOL_INFOA *)buffer); - buffer->iAddressFamily = address_family; - buffer->iSocketType = socket_type; - buffer->iProtocol = protocol; - + for (i = 0; i < ARRAY_SIZE(supported_protocols); ++i) + { + const WSAPROTOCOL_INFOW *info = &supported_protocols[i]; + if (address_family == info->iAddressFamily && + socket_type == info->iSocketType && + protocol >= info->iProtocol && protocol <= info->iProtocol + info->iProtocolMaxOffset) + { + if (unicode) + *buffer = *info; + else + { + WSAPROTOCOL_INFOA *bufferA = (WSAPROTOCOL_INFOA *)buffer; + memcpy( bufferA, info, offsetof( WSAPROTOCOL_INFOW, szProtocol ) ); + WideCharToMultiByte( CP_ACP, 0, info->szProtocol, -1, + bufferA->szProtocol, sizeof(bufferA->szProtocol), NULL, NULL ); + } + buffer->iProtocol = protocol; + return TRUE; + } + } + FIXME("Could not fill protocol information for family %d, type %d, protocol %d.\n", + address_family, socket_type, protocol); return TRUE; }

1 0

Martin Storsjo : msvcrt: Hook up __C_specific_handler for arm64.
by Alexandre Julliard Sept. 29, 2020

Sept. 29, 2020

Module: wine Branch: master Commit: 0e66993507eb67d5cd63cb6577a14c7cad0ac014 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0e66993507eb67d5cd63cb65… Author: Martin Storsjo <martin(a)martin.st> Date: Tue Sep 29 09:21:22 2020 +0300 msvcrt: Hook up __C_specific_handler for arm64. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/msvcrt.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 6d6767b435..204dfe62e5 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -172,7 +172,7 @@ @ extern _HUGE MSVCRT__HUGE @ cdecl _Strftime(ptr long str ptr ptr) @ cdecl _XcptFilter(long ptr) -@ stdcall -arch=x86_64 __C_specific_handler(ptr long ptr ptr) ntdll.__C_specific_handler +@ stdcall -arch=x86_64,arm64 __C_specific_handler(ptr long ptr ptr) ntdll.__C_specific_handler @ cdecl -arch=i386,x86_64,arm,arm64 __CppXcptFilter(long ptr) # stub __CxxCallUnwindDelDtor # stub __CxxCallUnwindDtor

1 0

Zebediah Figura : ws2_32: Look for supported socket parameters if any parameters to WSASocket() are zero.
by Alexandre Julliard Sept. 29, 2020

Sept. 29, 2020

Module: wine Branch: master Commit: 02a764e702094572186e079f6d48946627336d03 URL: https://source.winehq.org/git/wine.git/?a=commit;h=02a764e702094572186e079f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Sep 28 22:35:03 2020 -0500 ws2_32: Look for supported socket parameters if any parameters to WSASocket() are zero. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 43 ++++++++++++++++++------------------------- dlls/ws2_32/tests/sock.c | 6 ++---- 2 files changed, 20 insertions(+), 29 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 733e412db0..92e08f3675 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -284,16 +284,6 @@ static const WSAPROTOCOL_INFOW supported_protocols[] = }, }; -static const INT valid_protocols[] = -{ - WS_IPPROTO_TCP, - WS_IPPROTO_UDP, - WS_NSPROTO_IPX, - WS_NSPROTO_SPX, - WS_NSPROTO_SPXII, - 0 -}; - #define IS_IPX_PROTO(X) ((X) >= WS_NSPROTO_IPX && (X) <= WS_NSPROTO_IPX + 255) #if defined(IP_UNICAST_IF) && defined(SO_ATTACH_FILTER) @@ -7680,25 +7670,29 @@ SOCKET WINAPI WSASocketW(int af, int type, int protocol, return INVALID_SOCKET; } - if (!type) + if (!af && lpProtocolInfo) { - int autoproto = protocol; - WSAPROTOCOL_INFOW infow; + WSASetLastError(WSAEAFNOSUPPORT); + return INVALID_SOCKET; + } - /* default to the first valid protocol */ - if (!autoproto) - autoproto = valid_protocols[0]; - else if(IS_IPX_PROTO(autoproto)) - autoproto = WS_NSPROTO_IPX; + if (!af || !type || !protocol) + { + unsigned int i; - if (WS_EnterSingleProtocolW(autoproto, &infow)) + for (i = 0; i < ARRAY_SIZE(supported_protocols); ++i) { - type = infow.iSocketType; + const WSAPROTOCOL_INFOW *info = &supported_protocols[i]; + + if (af && af != info->iAddressFamily) continue; + if (type && type != info->iSocketType) continue; + if (protocol && (protocol < info->iProtocol || + protocol > info->iProtocol + info->iProtocolMaxOffset)) continue; + if (!protocol && !(info->dwProviderFlags & PFL_MATCHES_PROTOCOL_ZERO)) continue; - /* after win2003 it's no longer possible to pass AF_UNSPEC - using the protocol info struct */ - if (!lpProtocolInfo && af == WS_AF_UNSPEC) - af = infow.iAddressFamily; + if (!af) af = supported_protocols[i].iAddressFamily; + if (!type) type = supported_protocols[i].iSocketType; + if (!protocol) protocol = supported_protocols[i].iProtocol; } } @@ -7714,7 +7708,6 @@ SOCKET WINAPI WSASocketW(int af, int type, int protocol, unixaf = convert_af_w2u(af); unixtype = convert_socktype_w2u(type); protocol = convert_proto_w2u(protocol); - if (unixaf == AF_UNSPEC) unixaf = -1; /* filter invalid parameters */ if (protocol < 0) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index cbbc1db1ee..7f3c6a9fb3 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -2529,16 +2529,14 @@ static void test_WSASocket(void) { WSAPROTOCOL_INFOA info; - todo_wine_if (i == 19) ok(sock != INVALID_SOCKET, "Text %u: expected success\n", i); - if (sock == INVALID_SOCKET) continue; + ok(sock != INVALID_SOCKET, "Text %u: expected success\n", i); size = sizeof(info); err = getsockopt( sock, SOL_SOCKET, SO_PROTOCOL_INFOA, (char *)&info, &size ); ok(!err, "Test %u: getsockopt failed, error %u\n", i, WSAGetLastError()); ok(info.iAddressFamily == tests[i].ret_family, "Test %u: got wrong family %d\n", i, info.iAddressFamily); ok(info.iSocketType == tests[i].ret_type, "Test %u: got wrong type %d\n", i, info.iSocketType); - todo_wine_if (i == 10 || i == 11 || i == 16) - ok(info.iProtocol == tests[i].ret_protocol, "Test %u: got wrong protocol %d\n", i, info.iProtocol); + ok(info.iProtocol == tests[i].ret_protocol, "Test %u: got wrong protocol %d\n", i, info.iProtocol); closesocket( sock ); }

1 0

Derek Lesho : winegstreamer: Implement IMFMediaStream::GetStreamDescriptor.
by Alexandre Julliard Sept. 29, 2020

Sept. 29, 2020

Module: wine Branch: master Commit: 4228016b0cb79b04e00b34acb6087a6e381fd41c URL: https://source.winehq.org/git/wine.git/?a=commit;h=4228016b0cb79b04e00b34ac… Author: Derek Lesho <dlesho(a)codeweavers.com> Date: Mon Sep 28 15:59:54 2020 -0500 winegstreamer: Implement IMFMediaStream::GetStreamDescriptor. Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gst_private.h | 4 + dlls/winegstreamer/media_source.c | 59 ++++++++++++-- dlls/winegstreamer/mfplat.c | 165 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 223 insertions(+), 5 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4228016b0cb79b04e00b…

1 0

Zebediah Figura : ws2_32: Add protocol information for TCP and UDP over IPv6.
by Alexandre Julliard Sept. 29, 2020

Sept. 29, 2020

Module: wine Branch: master Commit: 9498f9625a7b4b704f10b1bb321685371b0c999f URL: https://source.winehq.org/git/wine.git/?a=commit;h=9498f9625a7b4b704f10b1bb… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Sep 28 22:35:04 2020 -0500 ws2_32: Add protocol information for TCP and UDP over IPv6. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 92e08f3675..2ba74cdb19 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -233,6 +233,37 @@ static const WSAPROTOCOL_INFOW supported_protocols[] = .dwMessageSize = 0xffbb, .szProtocol = {'U','D','P','/','I','P',0}, }, + { + .dwServiceFlags1 = XP1_IFS_HANDLES | XP1_EXPEDITED_DATA | XP1_GRACEFUL_CLOSE + | XP1_GUARANTEED_ORDER | XP1_GUARANTEED_DELIVERY, + .dwProviderFlags = PFL_MATCHES_PROTOCOL_ZERO, + .ProviderId = {0xf9eab0c0, 0x26d4, 0x11d0, {0xbb, 0xbf, 0x00, 0xaa, 0x00, 0x6c, 0x34, 0xe4}}, + .dwCatalogEntryId = 1004, + .ProtocolChain.ChainLen = 1, + .iVersion = 2, + .iAddressFamily = WS_AF_INET6, + .iMaxSockAddr = sizeof(struct WS_sockaddr_in6), + .iMinSockAddr = sizeof(struct WS_sockaddr_in6), + .iSocketType = WS_SOCK_STREAM, + .iProtocol = WS_IPPROTO_TCP, + .szProtocol = {'T','C','P','/','I','P','v','6',0}, + }, + { + .dwServiceFlags1 = XP1_IFS_HANDLES | XP1_SUPPORT_BROADCAST + | XP1_SUPPORT_MULTIPOINT | XP1_MESSAGE_ORIENTED | XP1_CONNECTIONLESS, + .dwProviderFlags = PFL_MATCHES_PROTOCOL_ZERO, + .ProviderId = {0xf9eab0c0, 0x26d4, 0x11d0, {0xbb, 0xbf, 0x00, 0xaa, 0x00, 0x6c, 0x34, 0xe4}}, + .dwCatalogEntryId = 1005, + .ProtocolChain.ChainLen = 1, + .iVersion = 2, + .iAddressFamily = WS_AF_INET6, + .iMaxSockAddr = sizeof(struct WS_sockaddr_in6), + .iMinSockAddr = sizeof(struct WS_sockaddr_in6), + .iSocketType = WS_SOCK_DGRAM, + .iProtocol = WS_IPPROTO_UDP, + .dwMessageSize = 0xffbb, + .szProtocol = {'U','D','P','/','I','P','v','6',0}, + }, { .dwServiceFlags1 = XP1_PARTIAL_MESSAGE | XP1_SUPPORT_BROADCAST | XP1_SUPPORT_MULTIPOINT | XP1_MESSAGE_ORIENTED | XP1_CONNECTIONLESS,

1 0

Zebediah Figura : netprofm: Do not use the WS_ prefix.
by Alexandre Julliard Sept. 29, 2020

Sept. 29, 2020

Module: wine Branch: master Commit: d6da10f3fb97f412ccb1ea4a806b13be3a0475e2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d6da10f3fb97f412ccb1ea4a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Sep 28 22:46:42 2020 -0500 netprofm: Do not use the WS_ prefix. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/netprofm/list.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/netprofm/list.c b/dlls/netprofm/list.c index 93e9d14308..def2aa6cf6 100644 --- a/dlls/netprofm/list.c +++ b/dlls/netprofm/list.c @@ -24,7 +24,6 @@ #include <stdarg.h> #include "windef.h" #include "winbase.h" -#define USE_WS_PREFIX #include "winsock2.h" #include "ws2ipdef.h" #include "iphlpapi.h" @@ -582,14 +581,14 @@ static BOOL map_address_6to4( const SOCKADDR_IN6 *addr6, SOCKADDR_IN *addr4 ) { ULONG i; - if (addr6->sin6_family != WS_AF_INET6) return FALSE; + if (addr6->sin6_family != AF_INET6) return FALSE; for (i = 0; i < 5; i++) if (addr6->sin6_addr.u.Word[i]) return FALSE; if (addr6->sin6_addr.u.Word[5] != 0xffff) return FALSE; - addr4->sin_family = WS_AF_INET; + addr4->sin_family = AF_INET; addr4->sin_port = addr6->sin6_port; addr4->sin_addr.S_un.S_addr = addr6->sin6_addr.u.Word[6] << 16 | addr6->sin6_addr.u.Word[7]; memset( &addr4->sin_zero, 0, sizeof(addr4->sin_zero) ); @@ -610,8 +609,8 @@ static HRESULT WINAPI cost_manager_GetDataPlanStatus( if (!pDataPlanStatus) return E_POINTER; - if (dst && ((dst->sa_family == WS_AF_INET && (dst4 = (SOCKADDR_IN *)dst)) || - ((dst->sa_family == WS_AF_INET6 && map_address_6to4( (const SOCKADDR_IN6 *)dst, &addr4 ) + if (dst && ((dst->sa_family == AF_INET && (dst4 = (SOCKADDR_IN *)dst)) || + ((dst->sa_family == AF_INET6 && map_address_6to4( (const SOCKADDR_IN6 *)dst, &addr4 ) && (dst4 = &addr4))))) { if ((ret = GetBestInterface( dst4->sin_addr.S_un.S_addr, &index ))) @@ -1718,11 +1717,11 @@ static void init_networks( struct list_manager *mgr ) list_init( &mgr->networks ); list_init( &mgr->connections ); - ret = GetAdaptersAddresses( WS_AF_UNSPEC, flags, NULL, NULL, &size ); + ret = GetAdaptersAddresses( AF_UNSPEC, flags, NULL, NULL, &size ); if (ret != ERROR_BUFFER_OVERFLOW) return; if (!(buf = heap_alloc( size ))) return; - if (GetAdaptersAddresses( WS_AF_UNSPEC, flags, NULL, buf, &size )) + if (GetAdaptersAddresses( AF_UNSPEC, flags, NULL, buf, &size )) { heap_free( buf ); return;

1 0

Derek Lesho : winegstreamer: Add a GstPad wrapping the media source's bytestream.
by Alexandre Julliard Sept. 29, 2020

Sept. 29, 2020

Module: wine Branch: master Commit: a4d6ad6d493467a4937d43a4c4ada343b0ed4c25 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a4d6ad6d493467a4937d43a4… Author: Derek Lesho <dlesho(a)codeweavers.com> Date: Mon Sep 28 15:59:52 2020 -0500 winegstreamer: Add a GstPad wrapping the media source's bytestream. Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gst_cbs.c | 58 ++++++++++++ dlls/winegstreamer/gst_cbs.h | 12 ++- dlls/winegstreamer/main.c | 3 + dlls/winegstreamer/media_source.c | 189 +++++++++++++++++++++++++++++++++++++- 4 files changed, 258 insertions(+), 4 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a4d6ad6d493467a4937d…

1 0

Christian Costa : d3dx9: Ignore vertices reordering for D3DXMESHOPT_ATTRSORT in OptimizeInPlace().
by Alexandre Julliard Sept. 29, 2020

Sept. 29, 2020

Module: wine Branch: master Commit: 1dcc3ab292151cd91ea4202b92107c3a91527c7a URL: https://source.winehq.org/git/wine.git/?a=commit;h=1dcc3ab292151cd91ea4202b… Author: Christian Costa <titan.costa(a)gmail.com> Date: Tue Sep 29 10:29:39 2020 +0200 d3dx9: Ignore vertices reordering for D3DXMESHOPT_ATTRSORT in OptimizeInPlace(). Not reordering vertices shouldn't have effects aside from performance. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48529 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/mesh.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index 22f86f10d0..8f7c926c32 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -1689,11 +1689,7 @@ static HRESULT WINAPI d3dx9_mesh_OptimizeInplace(ID3DXMesh *iface, DWORD flags, if (FAILED(hr)) goto cleanup; } else if (flags & D3DXMESHOPT_ATTRSORT) { if (!(flags & D3DXMESHOPT_IGNOREVERTS)) - { FIXME("D3DXMESHOPT_ATTRSORT vertex reordering not implemented.\n"); - hr = E_NOTIMPL; - goto cleanup; - } hr = iface->lpVtbl->LockAttributeBuffer(iface, 0, &attrib_buffer); if (FAILED(hr)) goto cleanup;

1 0

Martin Storsjo : winebuild: Add unwind info to arm64 syscall stubs.
by Alexandre Julliard Sept. 29, 2020

Sept. 29, 2020

Module: wine Branch: master Commit: 559d502699a477c00944284bb9ef7677ce6b8f18 URL: https://source.winehq.org/git/wine.git/?a=commit;h=559d502699a477c00944284b… Author: Martin Storsjo <martin(a)martin.st> Date: Tue Sep 29 09:21:53 2020 +0300 winebuild: Add unwind info to arm64 syscall stubs. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/import.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index 461f1851d6..0369efa803 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -1604,12 +1604,26 @@ void output_syscalls( DLLSPEC *spec ) output( "\tcmp x8, %u\n", count ); output( "\tbcs 3f\n" ); output( "\tstp x29, x30, [sp,#-160]!\n" ); + output_cfi( "\t.cfi_def_cfa_offset 160\n" ); + output_cfi( "\t.cfi_offset 29, -160\n" ); + output_cfi( "\t.cfi_offset 30, -152\n" ); output( "\tmov x29, sp\n" ); + output_cfi( "\t.cfi_def_cfa_register 29\n" ); output( "\tstp x27, x28, [sp, #144]\n" ); + output_cfi( "\t.cfi_offset 27, -16\n" ); + output_cfi( "\t.cfi_offset 28, -8\n" ); output( "\tstp x25, x26, [sp, #128]\n" ); + output_cfi( "\t.cfi_offset 25, -32\n" ); + output_cfi( "\t.cfi_offset 26, -24\n" ); output( "\tstp x23, x24, [sp, #112]\n" ); + output_cfi( "\t.cfi_offset 23, -48\n" ); + output_cfi( "\t.cfi_offset 24, -40\n" ); output( "\tstp x21, x22, [sp, #96]\n" ); + output_cfi( "\t.cfi_offset 21, -64\n" ); + output_cfi( "\t.cfi_offset 22, -56\n" ); output( "\tstp x19, x20, [sp, #80]\n" ); + output_cfi( "\t.cfi_offset 19, -80\n" ); + output_cfi( "\t.cfi_offset 20, -72\n" ); output( "\tstp x6, x7, [sp, #64]\n" ); output( "\tstp x4, x5, [sp, #48]\n" ); output( "\tstp x2, x3, [sp, #32]\n" ); @@ -1735,6 +1749,9 @@ void output_syscalls( DLLSPEC *spec ) break; case CPU_ARM64: output( "\tstp x29, x30, [sp,#-16]!\n" ); + output_cfi( "\t.cfi_def_cfa_offset 16\n" ); + output_cfi( "\t.cfi_offset 29, -16\n" ); + output_cfi( "\t.cfi_offset 30, -8\n" ); output( "\tmov x8, #%u\n", i ); output( "\tadrp x16, %s\n", arm64_page( asm_name("__wine_syscall_dispatcher") ) ); output( "\tldr x16, [x16, #%s]\n", arm64_pageoff( asm_name("__wine_syscall_dispatcher") ) );

1 0

Zebediah Figura : ws2_32: Reimplement WSAEnumProtocols() using a flat array of WSA_PROTOCOLINFO structures.
by Alexandre Julliard Sept. 29, 2020

Sept. 29, 2020

Module: wine Branch: master Commit: f4d376ea07c3797d31ff918b3e93129655ef670e URL: https://source.winehq.org/git/wine.git/?a=commit;h=f4d376ea07c3797d31ff918b… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Sep 28 22:35:02 2020 -0500 ws2_32: Reimplement WSAEnumProtocols() using a flat array of WSA_PROTOCOLINFO structures. Looking up protocol information by protocol number is not reliable, as protocol numbers for different families may overlap. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 210 ++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 149 insertions(+), 61 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index a52b708f8e..733e412db0 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -200,6 +200,90 @@ static const GUID ProviderIdIPX = { 0x11058240, 0xbe47, 0x11cf, static const GUID ProviderIdSPX = { 0x11058241, 0xbe47, 0x11cf, { 0x95, 0xc8, 0x00, 0x80, 0x5f, 0x48, 0xa1, 0x92 } }; +static const WSAPROTOCOL_INFOW supported_protocols[] = +{ + { + .dwServiceFlags1 = XP1_IFS_HANDLES | XP1_EXPEDITED_DATA | XP1_GRACEFUL_CLOSE + | XP1_GUARANTEED_ORDER | XP1_GUARANTEED_DELIVERY, + .dwProviderFlags = PFL_MATCHES_PROTOCOL_ZERO, + .ProviderId = {0xe70f1aa0, 0xab8b, 0x11cf, {0x8c, 0xa3, 0x00, 0x80, 0x5f, 0x48, 0xa1, 0x92}}, + .dwCatalogEntryId = 1001, + .ProtocolChain.ChainLen = 1, + .iVersion = 2, + .iAddressFamily = WS_AF_INET, + .iMaxSockAddr = sizeof(struct WS_sockaddr_in), + .iMinSockAddr = sizeof(struct WS_sockaddr_in), + .iSocketType = WS_SOCK_STREAM, + .iProtocol = WS_IPPROTO_TCP, + .szProtocol = {'T','C','P','/','I','P',0}, + }, + { + .dwServiceFlags1 = XP1_IFS_HANDLES | XP1_SUPPORT_BROADCAST + | XP1_SUPPORT_MULTIPOINT | XP1_MESSAGE_ORIENTED | XP1_CONNECTIONLESS, + .dwProviderFlags = PFL_MATCHES_PROTOCOL_ZERO, + .ProviderId = {0xe70f1aa0, 0xab8b, 0x11cf, {0x8c, 0xa3, 0x00, 0x80, 0x5f, 0x48, 0xa1, 0x92}}, + .dwCatalogEntryId = 1002, + .ProtocolChain.ChainLen = 1, + .iVersion = 2, + .iAddressFamily = WS_AF_INET, + .iMaxSockAddr = sizeof(struct WS_sockaddr_in), + .iMinSockAddr = sizeof(struct WS_sockaddr_in), + .iSocketType = WS_SOCK_DGRAM, + .iProtocol = WS_IPPROTO_UDP, + .dwMessageSize = 0xffbb, + .szProtocol = {'U','D','P','/','I','P',0}, + }, + { + .dwServiceFlags1 = XP1_PARTIAL_MESSAGE | XP1_SUPPORT_BROADCAST + | XP1_SUPPORT_MULTIPOINT | XP1_MESSAGE_ORIENTED | XP1_CONNECTIONLESS, + .dwProviderFlags = PFL_MATCHES_PROTOCOL_ZERO, + .ProviderId = {0x11058240, 0xbe47, 0x11cf, {0x95, 0xc8, 0x00, 0x80, 0x5f, 0x48, 0xa1, 0x92}}, + .dwCatalogEntryId = 1030, + .ProtocolChain.ChainLen = 1, + .iVersion = 2, + .iAddressFamily = WS_AF_IPX, + .iMaxSockAddr = sizeof(struct WS_sockaddr), + .iMinSockAddr = sizeof(struct WS_sockaddr_ipx), + .iSocketType = WS_SOCK_DGRAM, + .iProtocol = WS_NSPROTO_IPX, + .iProtocolMaxOffset = 255, + .dwMessageSize = 0x240, + .szProtocol = {'I','P','X',0}, + }, + { + .dwServiceFlags1 = XP1_IFS_HANDLES | XP1_PSEUDO_STREAM | XP1_MESSAGE_ORIENTED + | XP1_GUARANTEED_ORDER | XP1_GUARANTEED_DELIVERY, + .dwProviderFlags = PFL_MATCHES_PROTOCOL_ZERO, + .ProviderId = {0x11058241, 0xbe47, 0x11cf, {0x95, 0xc8, 0x00, 0x80, 0x5f, 0x48, 0xa1, 0x92}}, + .dwCatalogEntryId = 1031, + .ProtocolChain.ChainLen = 1, + .iVersion = 2, + .iAddressFamily = WS_AF_IPX, + .iMaxSockAddr = sizeof(struct WS_sockaddr), + .iMinSockAddr = sizeof(struct WS_sockaddr_ipx), + .iSocketType = WS_SOCK_SEQPACKET, + .iProtocol = WS_NSPROTO_SPX, + .dwMessageSize = UINT_MAX, + .szProtocol = {'S','P','X',0}, + }, + { + .dwServiceFlags1 = XP1_IFS_HANDLES | XP1_GRACEFUL_CLOSE | XP1_PSEUDO_STREAM + | XP1_MESSAGE_ORIENTED | XP1_GUARANTEED_ORDER | XP1_GUARANTEED_DELIVERY, + .dwProviderFlags = PFL_MATCHES_PROTOCOL_ZERO, + .ProviderId = {0x11058241, 0xbe47, 0x11cf, {0x95, 0xc8, 0x00, 0x80, 0x5f, 0x48, 0xa1, 0x92}}, + .dwCatalogEntryId = 1033, + .ProtocolChain.ChainLen = 1, + .iVersion = 2, + .iAddressFamily = WS_AF_IPX, + .iMaxSockAddr = sizeof(struct WS_sockaddr), + .iMinSockAddr = sizeof(struct WS_sockaddr_ipx), + .iSocketType = WS_SOCK_SEQPACKET, + .iProtocol = WS_NSPROTO_SPXII, + .dwMessageSize = UINT_MAX, + .szProtocol = {'S','P','X',' ','I','I',0}, + }, +}; + static const INT valid_protocols[] = { WS_IPPROTO_TCP, @@ -1869,15 +1953,6 @@ static inline BOOL supported_pf(int pf) } } -static inline BOOL supported_protocol(int protocol) -{ - int i; - for (i = 0; i < ARRAY_SIZE(valid_protocols); i++) - if (protocol == valid_protocols[i]) - return TRUE; - return FALSE; -} - /**********************************************************************/ /* Returns the length of the converted address if successful, 0 if it was too @@ -2345,54 +2420,6 @@ static BOOL WS_EnterSingleProtocolA( INT protocol, WSAPROTOCOL_INFOA* info ) return ret; } -static INT WS_EnumProtocols( BOOL unicode, const INT *protocols, LPWSAPROTOCOL_INFOW buffer, LPDWORD len ) -{ - INT i = 0, items = 0; - DWORD size = 0; - union _info - { - LPWSAPROTOCOL_INFOA a; - LPWSAPROTOCOL_INFOW w; - } info; - info.w = buffer; - - if (!protocols) protocols = valid_protocols; - - while (protocols[i]) - { - if(supported_protocol(protocols[i++])) - items++; - } - - size = items * (unicode ? sizeof(WSAPROTOCOL_INFOW) : sizeof(WSAPROTOCOL_INFOA)); - - TRACE("unicode %d, protocols %p, buffer %p, length %p %d, items %d, required %d\n", - unicode, protocols, buffer, len, len ? *len : 0, items, size); - - if (*len < size || !buffer) - { - *len = size; - SetLastError(WSAENOBUFS); - return SOCKET_ERROR; - } - - for (i = items = 0; protocols[i]; i++) - { - if (!supported_protocol(protocols[i])) continue; - if (unicode) - { - if (WS_EnterSingleProtocolW( protocols[i], &info.w[items] )) - items++; - } - else - { - if (WS_EnterSingleProtocolA( protocols[i], &info.a[items] )) - items++; - } - } - return items; -} - static BOOL ws_protocol_info(SOCKET s, int unicode, WSAPROTOCOL_INFOW *buffer, int *size) { NTSTATUS status; @@ -9104,14 +9131,52 @@ INT WINAPI WSANSPIoctl( HANDLE hLookup, DWORD dwControlCode, LPVOID lpvInBuffer, return SOCKET_ERROR; } +static BOOL protocol_matches_filter( const int *filter, int protocol ) +{ + if (!filter) return TRUE; + while (*filter) + { + if (protocol == *filter++) return TRUE; + } + return FALSE; +} + /***************************************************************************** * WSAEnumProtocolsA [WS2_32.@] * * see function WSAEnumProtocolsW */ -INT WINAPI WSAEnumProtocolsA( LPINT protocols, LPWSAPROTOCOL_INFOA buffer, LPDWORD len ) +int WINAPI WSAEnumProtocolsA( int *filter, WSAPROTOCOL_INFOA *protocols, DWORD *size ) { - return WS_EnumProtocols( FALSE, protocols, (LPWSAPROTOCOL_INFOW) buffer, len); + DWORD i, count = 0; + + TRACE("filter %p, protocols %p, size %p\n", filter, protocols, size); + + for (i = 0; i < ARRAY_SIZE(supported_protocols); ++i) + { + if (protocol_matches_filter( filter, supported_protocols[i].iProtocol )) + ++count; + } + + if (!protocols || *size < count * sizeof(WSAPROTOCOL_INFOA)) + { + *size = count * sizeof(WSAPROTOCOL_INFOA); + WSASetLastError( WSAENOBUFS ); + return SOCKET_ERROR; + } + + count = 0; + for (i = 0; i < ARRAY_SIZE(supported_protocols); ++i) + { + if (protocol_matches_filter( filter, supported_protocols[i].iProtocol )) + { + memcpy( &protocols[count], &supported_protocols[i], offsetof( WSAPROTOCOL_INFOW, szProtocol ) ); + WideCharToMultiByte( CP_ACP, 0, supported_protocols[i].szProtocol, -1, + protocols[count].szProtocol, sizeof(protocols[count].szProtocol), NULL, NULL ); + ++count; + } + } + return count; } /***************************************************************************** @@ -9151,9 +9216,32 @@ INT WINAPI WSAEnumProtocolsA( LPINT protocols, LPWSAPROTOCOL_INFOA buffer, LPDWO * - there is no check that the operating system supports the returned * protocols */ -INT WINAPI WSAEnumProtocolsW( LPINT protocols, LPWSAPROTOCOL_INFOW buffer, LPDWORD len ) +int WINAPI WSAEnumProtocolsW( int *filter, WSAPROTOCOL_INFOW *protocols, DWORD *size ) { - return WS_EnumProtocols( TRUE, protocols, buffer, len); + DWORD i, count = 0; + + TRACE("filter %p, protocols %p, size %p\n", filter, protocols, size); + + for (i = 0; i < ARRAY_SIZE(supported_protocols); ++i) + { + if (protocol_matches_filter( filter, supported_protocols[i].iProtocol )) + ++count; + } + + if (!protocols || *size < count * sizeof(WSAPROTOCOL_INFOW)) + { + *size = count * sizeof(WSAPROTOCOL_INFOW); + WSASetLastError( WSAENOBUFS ); + return SOCKET_ERROR; + } + + count = 0; + for (i = 0; i < ARRAY_SIZE(supported_protocols); ++i) + { + if (protocol_matches_filter( filter, supported_protocols[i].iProtocol )) + protocols[count++] = supported_protocols[i]; + } + return count; } /*****************************************************************************

1 0