wine-commits July 2021

wine-commits@winehq.org

1 participants
728 discussions

Huw Davies : iphlpapi: Implement IfGetEntry2Ex() on top of nsi.
by Alexandre Julliard 08 Jul '21

08 Jul '21

Module: wine Branch: master Commit: 0b5a6c704c06a850f6e92223fa29a2c08f99f86d URL: https://source.winehq.org/git/wine.git/?a=commit;h=0b5a6c704c06a850f6e92223… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Jul 8 08:59:58 2021 +0100 iphlpapi: Implement IfGetEntry2Ex() on top of nsi. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/iphlpapi.spec | 1 + dlls/iphlpapi/iphlpapi_main.c | 92 +++++++++++++++++------------------------- dlls/iphlpapi/tests/iphlpapi.c | 61 +++++++++------------------- include/netioapi.h | 2 + 4 files changed, 58 insertions(+), 98 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0b5a6c704c06a850f6e9…

1 0

Huw Davies : iphlpapi: Implement GetIfTable2Ex() on top of nsi.
by Alexandre Julliard 08 Jul '21

08 Jul '21

Module: wine Branch: master Commit: f41f028c392aeeab200ed86dc82b746cbbddc285 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f41f028c392aeeab200ed86d… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Jul 8 08:59:57 2021 +0100 iphlpapi: Implement GetIfTable2Ex() on top of nsi. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/iphlpapi_main.c | 106 ++++++++++++++++++++++++++++++++++-------- 1 file changed, 86 insertions(+), 20 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 13bfb81e7c9..dd2b9d7035c 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -61,6 +61,7 @@ #include "wine/nsi.h" #include "wine/debug.h" #include "wine/unicode.h" +#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(iphlpapi); @@ -1919,14 +1920,78 @@ DWORD WINAPI GetIfTable(PMIB_IFTABLE pIfTable, PULONG pdwSize, BOOL bOrder) return ret; } +static void if_counted_string_copy( WCHAR *dst, unsigned int len, IF_COUNTED_STRING *src ) +{ + unsigned int copy = src->Length; + + if (copy >= len * sizeof(WCHAR)) copy = 0; + memcpy( dst, src->String, copy ); + memset( (char *)dst + copy, 0, len * sizeof(WCHAR) - copy ); +} + +static void if_row2_fill( MIB_IF_ROW2 *row, struct nsi_ndis_ifinfo_rw *rw, struct nsi_ndis_ifinfo_dynamic *dyn, + struct nsi_ndis_ifinfo_static *stat ) +{ + row->InterfaceIndex = stat->if_index; + row->InterfaceGuid = stat->if_guid; + if_counted_string_copy( row->Alias, ARRAY_SIZE(row->Alias), &rw->alias ); + if_counted_string_copy( row->Description, ARRAY_SIZE(row->Description), &stat->descr ); + row->PhysicalAddressLength = rw->phys_addr.Length; + if (row->PhysicalAddressLength > sizeof(row->PhysicalAddress)) row->PhysicalAddressLength = 0; + memcpy( row->PhysicalAddress, rw->phys_addr.Address, row->PhysicalAddressLength ); + memcpy( row->PermanentPhysicalAddress, stat->perm_phys_addr.Address, row->PhysicalAddressLength ); + row->Mtu = dyn->mtu; + row->Type = stat->type; + row->TunnelType = TUNNEL_TYPE_NONE; /* fixme */ + row->MediaType = stat->media_type; + row->PhysicalMediumType = stat->phys_medium_type; + row->AccessType = stat->access_type; + row->DirectionType = NET_IF_DIRECTION_SENDRECEIVE; /* fixme */ + row->InterfaceAndOperStatusFlags.HardwareInterface = stat->flags.hw; + row->InterfaceAndOperStatusFlags.FilterInterface = stat->flags.filter; + row->InterfaceAndOperStatusFlags.ConnectorPresent = !!stat->conn_present; + row->InterfaceAndOperStatusFlags.NotAuthenticated = 0; /* fixme */ + row->InterfaceAndOperStatusFlags.NotMediaConnected = dyn->flags.not_media_conn; + row->InterfaceAndOperStatusFlags.Paused = 0; /* fixme */ + row->InterfaceAndOperStatusFlags.LowPower = 0; /* fixme */ + row->InterfaceAndOperStatusFlags.EndPointInterface = 0; /* fixme */ + row->OperStatus = dyn->oper_status; + row->AdminStatus = rw->admin_status; + row->MediaConnectState = dyn->media_conn_state; + row->NetworkGuid = rw->network_guid; + row->ConnectionType = stat->conn_type; + row->TransmitLinkSpeed = dyn->xmit_speed; + row->ReceiveLinkSpeed = dyn->rcv_speed; + row->InOctets = dyn->in_octets; + row->InUcastPkts = dyn->in_ucast_pkts; + row->InNUcastPkts = dyn->in_bcast_pkts + dyn->in_mcast_pkts; + row->InDiscards = dyn->in_discards; + row->InErrors = dyn->in_errors; + row->InUnknownProtos = 0; /* fixme */ + row->InUcastOctets = dyn->in_ucast_octs; + row->InMulticastOctets = dyn->in_mcast_octs; + row->InBroadcastOctets = dyn->in_bcast_octs; + row->OutOctets = dyn->out_octets; + row->OutUcastPkts = dyn->out_ucast_pkts; + row->OutNUcastPkts = dyn->out_bcast_pkts + dyn->out_mcast_pkts; + row->OutDiscards = dyn->out_discards; + row->OutErrors = dyn->out_errors; + row->OutUcastOctets = dyn->out_ucast_octs; + row->OutMulticastOctets = dyn->out_mcast_octs; + row->OutBroadcastOctets = dyn->out_bcast_octs; + row->OutQLen = 0; /* fixme */ +} + /****************************************************************** * GetIfTable2Ex (IPHLPAPI.@) */ DWORD WINAPI GetIfTable2Ex( MIB_IF_TABLE_LEVEL level, MIB_IF_TABLE2 **table ) { - DWORD i, nb_interfaces, size = sizeof(MIB_IF_TABLE2); - InterfaceIndexTable *index_table; - MIB_IF_TABLE2 *ret; + DWORD i, count, size, err; + NET_LUID *keys; + struct nsi_ndis_ifinfo_rw *rw; + struct nsi_ndis_ifinfo_dynamic *dyn; + struct nsi_ndis_ifinfo_static *stat; TRACE( "level %u, table %p\n", level, table ); @@ -1936,29 +2001,30 @@ DWORD WINAPI GetIfTable2Ex( MIB_IF_TABLE_LEVEL level, MIB_IF_TABLE2 **table ) if (level != MibIfTableNormal) FIXME("level %u not fully supported\n", level); - if ((nb_interfaces = get_interface_indices( FALSE, NULL )) > 1) - size += (nb_interfaces - 1) * sizeof(MIB_IF_ROW2); + err = NsiAllocateAndGetTable( 1, &NPI_MS_NDIS_MODULEID, NSI_NDIS_IFINFO_TABLE, (void **)&keys, sizeof(*keys), + (void **)&rw, sizeof(*rw), (void **)&dyn, sizeof(*dyn), + (void **)&stat, sizeof(*stat), &count, 0 ); + if (err) return err; - if (!(ret = HeapAlloc( GetProcessHeap(), 0, size ))) return ERROR_OUTOFMEMORY; + size = FIELD_OFFSET( MIB_IF_TABLE2, Table[count] ); - get_interface_indices( FALSE, &index_table ); - if (!index_table) + if (!(*table = heap_alloc_zero( size ))) { - HeapFree( GetProcessHeap(), 0, ret ); - return ERROR_OUTOFMEMORY; + err = ERROR_OUTOFMEMORY; + goto err; } - ret->NumEntries = 0; - for (i = 0; i < index_table->numIndexes; i++) + (*table)->NumEntries = count; + for (i = 0; i < count; i++) { - ret->Table[i].InterfaceIndex = index_table->indexes[i]; - GetIfEntry2( &ret->Table[i] ); - ret->NumEntries++; - } + MIB_IF_ROW2 *row = (*table)->Table + i; - HeapFree( GetProcessHeap(), 0, index_table ); - *table = ret; - return NO_ERROR; + row->InterfaceLuid.Value = keys[i].Value; + if_row2_fill( row, rw + i, dyn + i, stat + i ); + } +err: + NsiFreeTable( keys, rw, dyn, stat ); + return err; } /****************************************************************** @@ -1967,7 +2033,7 @@ DWORD WINAPI GetIfTable2Ex( MIB_IF_TABLE_LEVEL level, MIB_IF_TABLE2 **table ) DWORD WINAPI GetIfTable2( MIB_IF_TABLE2 **table ) { TRACE( "table %p\n", table ); - return GetIfTable2Ex(MibIfTableNormal, table); + return GetIfTable2Ex( MibIfTableNormal, table ); } /******************************************************************

1 0

Zebediah Figura : include: Fix a byte offset in a comment.
by Alexandre Julliard 08 Jul '21

08 Jul '21

Module: wine Branch: master Commit: f251f51d1ca78d1bff632a5587ba83f7212a4f9d URL: https://source.winehq.org/git/wine.git/?a=commit;h=f251f51d1ca78d1bff632a55… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Jul 7 20:39:23 2021 -0500 include: Fix a byte offset in a comment. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/winbase16.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/wine/winbase16.h b/include/wine/winbase16.h index 71493395f3a..1d052130e33 100644 --- a/include/wine/winbase16.h +++ b/include/wine/winbase16.h @@ -197,7 +197,7 @@ typedef struct _STACK16FRAME DWORD callfrom_ip; /* 18 callfrom tail IP */ DWORD module_cs; /* 1c module code segment */ DWORD relay; /* 20 relay function address */ - WORD entry_ip; /* 22 entry point IP */ + WORD entry_ip; /* 24 entry point IP */ DWORD entry_point; /* 26 API entry point to call, reused as mutex count */ WORD bp; /* 2a 16-bit stack frame chain */ WORD ip; /* 2c return address */

1 0

Zebediah Figura : ws2_32: Move the getsockopt(IP_MULTICAST_LOOP) implementation to ntdll.
by Alexandre Julliard 08 Jul '21

08 Jul '21

Module: wine Branch: master Commit: 2de3effee493f07a806df4b3b819c4010b47b754 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2de3effee493f07a806df4b3… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Jul 7 20:16:42 2021 -0500 ws2_32: Move the getsockopt(IP_MULTICAST_LOOP) implementation to ntdll. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/socket.c | 3 +++ dlls/ws2_32/socket.c | 2 ++ include/wine/afd.h | 1 + 3 files changed, 6 insertions(+) diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index c334be246bb..e5abb3828c3 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -1756,6 +1756,9 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc case IOCTL_AFD_WINE_SET_IP_MULTICAST_IF: return do_setsockopt( handle, io, IPPROTO_IP, IP_MULTICAST_IF, in_buffer, in_size ); + case IOCTL_AFD_WINE_GET_IP_MULTICAST_LOOP: + return do_getsockopt( handle, io, IPPROTO_IP, IP_MULTICAST_LOOP, out_buffer, out_size ); + default: { if ((code >> 16) == FILE_DEVICE_NETWORK) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 031fad1df3e..cb49fa4107a 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2443,6 +2443,8 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, return server_getsockopt( s, IOCTL_AFD_WINE_GET_IP_MULTICAST_IF, optval, optlen ); case WS_IP_MULTICAST_LOOP: + return server_getsockopt( s, IOCTL_AFD_WINE_GET_IP_MULTICAST_LOOP, optval, optlen ); + case WS_IP_MULTICAST_TTL: case WS_IP_OPTIONS: #if defined(IP_PKTINFO) || defined(IP_RECVDSTADDR) diff --git a/include/wine/afd.h b/include/wine/afd.h index ce92651274d..218b65986bb 100644 --- a/include/wine/afd.h +++ b/include/wine/afd.h @@ -192,6 +192,7 @@ struct afd_get_events_params #define IOCTL_AFD_WINE_SET_IP_HDRINCL WINE_AFD_IOC(247) #define IOCTL_AFD_WINE_GET_IP_MULTICAST_IF WINE_AFD_IOC(248) #define IOCTL_AFD_WINE_SET_IP_MULTICAST_IF WINE_AFD_IOC(249) +#define IOCTL_AFD_WINE_GET_IP_MULTICAST_LOOP WINE_AFD_IOC(250) struct afd_create_params {

1 0

Zebediah Figura : ws2_32: Move the setsockopt(IP_MULTICAST_IF) implementation to ntdll.
by Alexandre Julliard 08 Jul '21

08 Jul '21

Module: wine Branch: master Commit: 9ad2f988c7d0847d0adb6afcb4c7f4cb74ce7eab URL: https://source.winehq.org/git/wine.git/?a=commit;h=9ad2f988c7d0847d0adb6afc… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Jul 7 20:16:41 2021 -0500 ws2_32: Move the setsockopt(IP_MULTICAST_IF) implementation to ntdll. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/socket.c | 3 +++ dlls/ws2_32/socket.c | 4 +++- include/wine/afd.h | 1 + 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index 63f9bab36de..c334be246bb 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -1753,6 +1753,9 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc case IOCTL_AFD_WINE_GET_IP_MULTICAST_IF: return do_getsockopt( handle, io, IPPROTO_IP, IP_MULTICAST_IF, out_buffer, out_size ); + case IOCTL_AFD_WINE_SET_IP_MULTICAST_IF: + return do_setsockopt( handle, io, IPPROTO_IP, IP_MULTICAST_IF, in_buffer, in_size ); + default: { if ((code >> 16) == FILE_DEVICE_NETWORK) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index f8784b094ae..031fad1df3e 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3648,6 +3648,9 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname, case WS_IP_HDRINCL: return server_setsockopt( s, IOCTL_AFD_WINE_SET_IP_HDRINCL, optval, optlen ); + case WS_IP_MULTICAST_IF: + return server_setsockopt( s, IOCTL_AFD_WINE_SET_IP_MULTICAST_IF, optval, optlen ); + case WS_IP_UNBLOCK_SOURCE: { WS_IP_MREQ_SOURCE* val = (void*)optval; @@ -3661,7 +3664,6 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname, convert_sockopt(&level, &optname); break; } - case WS_IP_MULTICAST_IF: case WS_IP_MULTICAST_LOOP: case WS_IP_MULTICAST_TTL: case WS_IP_OPTIONS: diff --git a/include/wine/afd.h b/include/wine/afd.h index ad597b9814b..ce92651274d 100644 --- a/include/wine/afd.h +++ b/include/wine/afd.h @@ -191,6 +191,7 @@ struct afd_get_events_params #define IOCTL_AFD_WINE_GET_IP_HDRINCL WINE_AFD_IOC(246) #define IOCTL_AFD_WINE_SET_IP_HDRINCL WINE_AFD_IOC(247) #define IOCTL_AFD_WINE_GET_IP_MULTICAST_IF WINE_AFD_IOC(248) +#define IOCTL_AFD_WINE_SET_IP_MULTICAST_IF WINE_AFD_IOC(249) struct afd_create_params {

1 0

Zebediah Figura : ws2_32: Move the getsockopt(IP_MULTICAST_IF) implementation to ntdll.
by Alexandre Julliard 08 Jul '21

08 Jul '21

Module: wine Branch: master Commit: 946c4649e07e7a77936b5a48812d17e6b962f199 URL: https://source.winehq.org/git/wine.git/?a=commit;h=946c4649e07e7a77936b5a48… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Jul 7 20:16:40 2021 -0500 ws2_32: Move the getsockopt(IP_MULTICAST_IF) implementation to ntdll. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/socket.c | 3 +++ dlls/ws2_32/socket.c | 2 ++ include/wine/afd.h | 1 + 3 files changed, 6 insertions(+) diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index eeb495b82c0..63f9bab36de 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -1750,6 +1750,9 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc return do_setsockopt( handle, io, IPPROTO_IP, IP_HDRINCL, in_buffer, in_size ); #endif + case IOCTL_AFD_WINE_GET_IP_MULTICAST_IF: + return do_getsockopt( handle, io, IPPROTO_IP, IP_MULTICAST_IF, out_buffer, out_size ); + default: { if ((code >> 16) == FILE_DEVICE_NETWORK) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index a354e6a31a5..f8784b094ae 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2440,6 +2440,8 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, return server_getsockopt( s, IOCTL_AFD_WINE_GET_IP_HDRINCL, optval, optlen ); case WS_IP_MULTICAST_IF: + return server_getsockopt( s, IOCTL_AFD_WINE_GET_IP_MULTICAST_IF, optval, optlen ); + case WS_IP_MULTICAST_LOOP: case WS_IP_MULTICAST_TTL: case WS_IP_OPTIONS: diff --git a/include/wine/afd.h b/include/wine/afd.h index 4e76bbce6e2..ad597b9814b 100644 --- a/include/wine/afd.h +++ b/include/wine/afd.h @@ -190,6 +190,7 @@ struct afd_get_events_params #define IOCTL_AFD_WINE_SET_IP_DROP_SOURCE_MEMBERSHIP WINE_AFD_IOC(245) #define IOCTL_AFD_WINE_GET_IP_HDRINCL WINE_AFD_IOC(246) #define IOCTL_AFD_WINE_SET_IP_HDRINCL WINE_AFD_IOC(247) +#define IOCTL_AFD_WINE_GET_IP_MULTICAST_IF WINE_AFD_IOC(248) struct afd_create_params {

1 0

Zebediah Figura : ws2_32: Move the setsockopt(IP_HDRINCL) implementation to ntdll.
by Alexandre Julliard 08 Jul '21

08 Jul '21

Module: wine Branch: master Commit: f0533d9a5ada291c371e6267360e9b73c78a24f3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f0533d9a5ada291c371e6267… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Jul 7 20:16:39 2021 -0500 ws2_32: Move the setsockopt(IP_HDRINCL) implementation to ntdll. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/socket.c | 3 +++ dlls/ws2_32/socket.c | 6 +++--- dlls/ws2_32/tests/sock.c | 20 +++++++++++--------- include/wine/afd.h | 1 + 4 files changed, 18 insertions(+), 12 deletions(-) diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index 1fbe1c8b663..eeb495b82c0 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -1745,6 +1745,9 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc #ifdef IP_HDRINCL case IOCTL_AFD_WINE_GET_IP_HDRINCL: return do_getsockopt( handle, io, IPPROTO_IP, IP_HDRINCL, out_buffer, out_size ); + + case IOCTL_AFD_WINE_SET_IP_HDRINCL: + return do_setsockopt( handle, io, IPPROTO_IP, IP_HDRINCL, in_buffer, in_size ); #endif default: diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index e38ca770ce5..a354e6a31a5 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3643,6 +3643,9 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname, case WS_IP_DROP_SOURCE_MEMBERSHIP: return server_setsockopt( s, IOCTL_AFD_WINE_SET_IP_DROP_SOURCE_MEMBERSHIP, optval, optlen ); + case WS_IP_HDRINCL: + return server_setsockopt( s, IOCTL_AFD_WINE_SET_IP_HDRINCL, optval, optlen ); + case WS_IP_UNBLOCK_SOURCE: { WS_IP_MREQ_SOURCE* val = (void*)optval; @@ -3656,9 +3659,6 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname, convert_sockopt(&level, &optname); break; } -#ifdef IP_HDRINCL - case WS_IP_HDRINCL: -#endif case WS_IP_MULTICAST_IF: case WS_IP_MULTICAST_LOOP: case WS_IP_MULTICAST_TTL: diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 97b772e12d9..e7bd3b8fe15 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1431,29 +1431,31 @@ todo_wine err = setsockopt(s, IPPROTO_IP, IP_HDRINCL, (char *) &k, size); if (err == -1) /* >= Vista */ { - todo_wine { ok(GetLastError() == WSAEINVAL, "Expected 10022, got %d\n", GetLastError()); k = 99; SetLastError(0xdeadbeef); err = getsockopt(s, IPPROTO_IP, IP_HDRINCL, (char *) &k, &size); - ok(err == -1, "Expected -1, got %d\n", err); - ok(GetLastError() == WSAEINVAL, "Expected 10022, got %d\n", GetLastError()); - ok(k == 99, "Expected 99, got %d\n", k); + todo_wine + { + ok(err == -1, "Expected -1, got %d\n", err); + ok(GetLastError() == WSAEINVAL, "Expected 10022, got %d\n", GetLastError()); + ok(k == 99, "Expected 99, got %d\n", k); + } size = sizeof(k); k = 0; SetLastError(0xdeadbeef); err = setsockopt(s, IPPROTO_IP, IP_HDRINCL, (char *) &k, size); - } ok(err == -1, "Expected -1, got %d\n", err); - todo_wine { ok(GetLastError() == WSAEINVAL, "Expected 10022, got %d\n", GetLastError()); k = 99; SetLastError(0xdeadbeef); err = getsockopt(s, IPPROTO_IP, IP_HDRINCL, (char *) &k, &size); - ok(err == -1, "Expected -1, got %d\n", err); - ok(GetLastError() == WSAEINVAL, "Expected 10022, got %d\n", GetLastError()); - ok(k == 99, "Expected 99, got %d\n", k); + todo_wine + { + ok(err == -1, "Expected -1, got %d\n", err); + ok(GetLastError() == WSAEINVAL, "Expected 10022, got %d\n", GetLastError()); + ok(k == 99, "Expected 99, got %d\n", k); } } else /* <= 2003 the tests differ between TCP and UDP, UDP silently accepts */ diff --git a/include/wine/afd.h b/include/wine/afd.h index 3b293cc49f2..4e76bbce6e2 100644 --- a/include/wine/afd.h +++ b/include/wine/afd.h @@ -189,6 +189,7 @@ struct afd_get_events_params #define IOCTL_AFD_WINE_SET_IP_DROP_MEMBERSHIP WINE_AFD_IOC(244) #define IOCTL_AFD_WINE_SET_IP_DROP_SOURCE_MEMBERSHIP WINE_AFD_IOC(245) #define IOCTL_AFD_WINE_GET_IP_HDRINCL WINE_AFD_IOC(246) +#define IOCTL_AFD_WINE_SET_IP_HDRINCL WINE_AFD_IOC(247) struct afd_create_params {

1 0

Zebediah Figura : ws2_32: Move the getsockopt(IP_HDRINCL) implementation to ntdll.
by Alexandre Julliard 08 Jul '21

08 Jul '21

Module: wine Branch: master Commit: 342795edb3e75b10e7e3b34f378b2f976ae5e356 URL: https://source.winehq.org/git/wine.git/?a=commit;h=342795edb3e75b10e7e3b34f… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Jul 7 20:16:38 2021 -0500 ws2_32: Move the getsockopt(IP_HDRINCL) implementation to ntdll. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/socket.c | 5 +++++ dlls/ws2_32/socket.c | 4 ++-- include/wine/afd.h | 1 + 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index 46ed673b81e..1fbe1c8b663 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -1742,6 +1742,11 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc case IOCTL_AFD_WINE_SET_IP_DROP_SOURCE_MEMBERSHIP: return do_setsockopt( handle, io, IPPROTO_IP, IP_DROP_SOURCE_MEMBERSHIP, in_buffer, in_size ); +#ifdef IP_HDRINCL + case IOCTL_AFD_WINE_GET_IP_HDRINCL: + return do_getsockopt( handle, io, IPPROTO_IP, IP_HDRINCL, out_buffer, out_size ); +#endif + default: { if ((code >> 16) == FILE_DEVICE_NETWORK) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 09f04fff60f..e38ca770ce5 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2436,9 +2436,9 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, case WS_IP_DONTFRAGMENT: return server_getsockopt( s, IOCTL_AFD_WINE_GET_IP_DONTFRAGMENT, optval, optlen ); -#ifdef IP_HDRINCL case WS_IP_HDRINCL: -#endif + return server_getsockopt( s, IOCTL_AFD_WINE_GET_IP_HDRINCL, optval, optlen ); + case WS_IP_MULTICAST_IF: case WS_IP_MULTICAST_LOOP: case WS_IP_MULTICAST_TTL: diff --git a/include/wine/afd.h b/include/wine/afd.h index 93c1744c031..3b293cc49f2 100644 --- a/include/wine/afd.h +++ b/include/wine/afd.h @@ -188,6 +188,7 @@ struct afd_get_events_params #define IOCTL_AFD_WINE_SET_IP_DONTFRAGMENT WINE_AFD_IOC(243) #define IOCTL_AFD_WINE_SET_IP_DROP_MEMBERSHIP WINE_AFD_IOC(244) #define IOCTL_AFD_WINE_SET_IP_DROP_SOURCE_MEMBERSHIP WINE_AFD_IOC(245) +#define IOCTL_AFD_WINE_GET_IP_HDRINCL WINE_AFD_IOC(246) struct afd_create_params {

1 0

Conor McCarthy : vkd3d-shader: Normalise descriptor register indices to shader model 5.1.
by Alexandre Julliard 08 Jul '21

08 Jul '21

Module: vkd3d Branch: master Commit: 1acb3de9bd90aac6961f67d1c964da7e54ecd218 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=1acb3de9bd90aac6961f67d… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Thu Jul 8 17:17:50 2021 +0200 vkd3d-shader: Normalise descriptor register indices to shader model 5.1. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/dxbc.c | 28 +++++++++++++++++++++------- libs/vkd3d-shader/trace.c | 13 +++++++++---- 2 files changed, 30 insertions(+), 11 deletions(-) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 4bc6201..b81ac97 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -637,8 +637,8 @@ static void shader_sm4_read_shader_data(struct vkd3d_shader_instruction *ins, static void shader_sm4_set_descriptor_register_range(struct vkd3d_sm4_data *priv, struct vkd3d_shader_register *reg, struct vkd3d_shader_register_range *range) { - range->first = reg->idx[shader_is_sm_5_1(priv) ? 1 : 0].offset; - range->last = reg->idx[shader_is_sm_5_1(priv) ? 2 : 0].offset; + range->first = reg->idx[1].offset; + range->last = reg->idx[shader_is_sm_5_1(priv) ? 2 : 1].offset; if (range->last < range->first) { FIXME("Invalid register range [%u:%u].\n", range->first, range->last); @@ -1516,6 +1516,21 @@ static bool shader_sm4_read_reg_idx(struct vkd3d_sm4_data *priv, const DWORD **p return true; } +static bool sm4_register_is_descriptor(enum vkd3d_sm4_register_type register_type) +{ + switch (register_type) + { + case VKD3D_SM4_RT_SAMPLER: + case VKD3D_SM4_RT_RESOURCE: + case VKD3D_SM4_RT_CONSTBUFFER: + case VKD3D_SM5_RT_UAV: + return true; + + default: + return false; + } +} + static bool shader_sm4_read_param(struct vkd3d_sm4_data *priv, const DWORD **ptr, const DWORD *end, enum vkd3d_data_type data_type, struct vkd3d_shader_register *param, enum vkd3d_shader_src_modifier *modifier) @@ -1667,13 +1682,12 @@ static bool shader_sm4_read_param(struct vkd3d_sm4_data *priv, const DWORD **ptr break; } } - else if (register_type == VKD3D_SM4_RT_CONSTBUFFER && order == 2) + else if (!shader_is_sm_5_1(priv) && sm4_register_is_descriptor(register_type)) { - /* SM5.1 places the buffer offset in idx[2]; earlier versions place it - * in idx[1]. Normalize to SM5.1. */ + /* SM5.1 places a symbol identifier in idx[0] and moves + * other values up one slot. Normalize to SM5.1. */ param->idx[2] = param->idx[1]; - param->idx[1].rel_addr = NULL; - param->idx[1].offset = 0; + param->idx[1] = param->idx[0]; } map_register(priv, param); diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index 2d16714..79a6089 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -766,6 +766,7 @@ static void shader_dump_register(struct vkd3d_d3d_asm_compiler *compiler, const { struct vkd3d_string_buffer *buffer = &compiler->buffer; unsigned int offset = reg->idx[0].offset; + bool is_descriptor = false; static const char * const rastout_reg_names[] = {"oPos", "oFog", "oPts"}; static const char * const misctype_reg_names[] = {"vPos", "vFace"}; @@ -847,6 +848,7 @@ static void shader_dump_register(struct vkd3d_d3d_asm_compiler *compiler, const case VKD3DSPR_SAMPLER: shader_addline(buffer, "s"); + is_descriptor = true; break; case VKD3DSPR_MISCTYPE: @@ -871,6 +873,7 @@ static void shader_dump_register(struct vkd3d_d3d_asm_compiler *compiler, const case VKD3DSPR_CONSTBUFFER: shader_addline(buffer, "cb"); + is_descriptor = true; break; case VKD3DSPR_IMMCONSTBUFFER: @@ -891,10 +894,12 @@ static void shader_dump_register(struct vkd3d_d3d_asm_compiler *compiler, const case VKD3DSPR_RESOURCE: shader_addline(buffer, "t"); + is_descriptor = true; break; case VKD3DSPR_UAV: shader_addline(buffer, "u"); + is_descriptor = true; break; case VKD3DSPR_OUTPOINTID: @@ -1057,11 +1062,11 @@ static void shader_dump_register(struct vkd3d_d3d_asm_compiler *compiler, const vkd3d_string_buffer_printf(buffer, "%u%s", offset, compiler->colours.reset); } - /* For CBs in sm < 5.1 we move the buffer offset from idx[1] to idx[2] - * to normalise it with 5.1. - * Here we should ignore it if it's a CB in sm < 5.1. */ + /* For descriptors in sm < 5.1 we move the reg->idx values up one slot + * to normalise with 5.1. + * Here we should ignore it if it's a descriptor in sm < 5.1. */ if (reg->idx[1].offset != ~0u && - (reg->type != VKD3DSPR_CONSTBUFFER || shader_ver_ge(&compiler->shader_version, 5, 1))) + (!is_descriptor || shader_ver_ge(&compiler->shader_version, 5, 1))) shader_print_subscript(compiler, reg->idx[1].offset, reg->idx[1].rel_addr); if (reg->idx[2].offset != ~0u)

1 0

Julian Rüger : German translation for OSPP summer update.
by Alexandre Julliard 08 Jul '21

08 Jul '21

Module: website Branch: master Commit: a5092f35d93f39862f45c4a76db573fda5e2e65f URL: https://source.winehq.org/git/website.git/?a=commit;h=a5092f35d93f39862f45c… Author: Julian Rüger <jr98(a)gmx.net> Date: Thu Jul 8 12:11:44 2021 +0200 German translation for OSPP summer update. Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/de/2021070301.xml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/news/de/2021070301.xml b/news/de/2021070301.xml new file mode 100644 index 00000000..c450451b --- /dev/null +++ b/news/de/2021070301.xml @@ -0,0 +1,13 @@ +<news> +<date>3. Juli 2021</date> +<title>OSPP-Sommer 2021</title> +<body> +<p> Dieses Jahr werden drei Schüler/Studenten für das Wine-Projekt am OSPP-Sommer 2021 teilnehmen. Willkommen!</p> +<ul> +<li><a href="https://summer.iscas.ac.cn/#/org/prodetail/210900805?lang=en">Florian Eder: Implementierung von robocopy.exe</a></li> +<li><a href="https://summer.iscas.ac.cn/#/org/prodetail/210900808?lang=en">Atharva Nimbalkar: Port von wined3ds GLSL-Generator zu vkd3d-shader</a></li> +<li><a href="https://summer.iscas.ac.cn/#/org/prodetail/210900814?lang=en">Qingyi Wang: Dokumentationsverbesserungen für vkd3d-shader</a></li> +</ul> +Viel Spaß beim Wine-Programmieren diesen Sommer! :) +</body> +</news>

1 0

← Newer
1
...
45
46
47
48
49
50
51
...
73
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 July 2021