wine-commits September 2020

1 participants
703 discussions

Zebediah Figura : ws2_32: Add protocol information for TCP and UDP over IPv6.

by Alexandre Julliard

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,

3 years, 7 months

Zebediah Figura : ws2_32: Look for supported socket parameters if any parameters to WSASocket() are zero.

by Alexandre Julliard

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 ); }

3 years, 7 months

Zebediah Figura : ws2_32: Reimplement WSAEnumProtocols() using a flat array of WSA_PROTOCOLINFO structures.

by Alexandre Julliard

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; } /*****************************************************************************

3 years, 7 months

Martin Storsjo : msvcrt: Hook up __C_specific_handler for arm64.

by Alexandre Julliard

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

3 years, 7 months

Martin Storsjo : winebuild: Add unwind info to arm64 syscall stubs.

by Alexandre Julliard

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") ) );

3 years, 7 months

Christian Costa : d3dx9: Ignore vertices reordering for D3DXMESHOPT_ATTRSORT in OptimizeInPlace().

by Alexandre Julliard

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;

3 years, 7 months

Ziqing Hui : d3dx10: Move D3DX10GetImageInfo*() to texture.c.

by Alexandre Julliard

Module: wine Branch: master Commit: 3c068a2d86f09229f442155ca0d5dc8cb5a05186 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3c068a2d86f09229f442155c… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Fri Sep 25 11:12:10 2020 +0800 d3dx10: Move D3DX10GetImageInfo*() to texture.c. 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/Makefile.in | 3 +- dlls/d3dx10_43/d3dx10_43_main.c | 209 ----------------------------------- dlls/d3dx10_43/texture.c | 235 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 237 insertions(+), 210 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3c068a2d86f09229f442…

3 years, 7 months

Derek Lesho : winegstreamer: Implement IMFMediaStream::GetStreamDescriptor.

by Alexandre Julliard

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…

3 years, 7 months

Derek Lesho : winegstreamer: Use decodebin to initialize media streams.

by Alexandre Julliard

Module: wine Branch: master Commit: 7d4395a00e6a5222dae859746b61ab68039a8e3e URL: https://source.winehq.org/git/wine.git/?a=commit;h=7d4395a00e6a5222dae85974… Author: Derek Lesho <dlesho(a)codeweavers.com> Date: Mon Sep 28 15:59:53 2020 -0500 winegstreamer: Use decodebin to initialize media streams. 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 | 45 +++++ dlls/winegstreamer/gst_cbs.h | 8 + dlls/winegstreamer/media_source.c | 401 +++++++++++++++++++++++++++++++++++++- 3 files changed, 453 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7d4395a00e6a5222dae8…

3 years, 7 months

Derek Lesho : winegstreamer: Add a GstPad wrapping the media source's bytestream.

by Alexandre Julliard

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…

3 years, 7 months

← Newer
1
2
3
4
5
6
7
8
9
...
71
Older →

Jump to page:

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 2020