system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-10-06 18:37:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

netprofm: Do not use the WS_ prefix.

Browse source 
Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Zebediah Figura 2020-09-28 22:46:42 -05:00 committed by Alexandre Julliard
parent 0c2f556afe
commit d6da10f3fb
1 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
dlls/netprofm/list.c
View file

@ -24,7 +24,6 @@
#include <stdarg.h> #include <stdarg.h>
#include "windef.h" #include "windef.h"
#include "winbase.h" #include "winbase.h"
#define USE_WS_PREFIX
#include "winsock2.h" #include "winsock2.h"
#include "ws2ipdef.h" #include "ws2ipdef.h"
#include "iphlpapi.h" #include "iphlpapi.h"
@ -582,14 +581,14 @@ static BOOL map_address_6to4( const SOCKADDR_IN6 *addr6, SOCKADDR_IN *addr4 )
{ {
ULONG i; 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++) for (i = 0; i < 5; i++)
if (addr6->sin6_addr.u.Word[i]) return FALSE; if (addr6->sin6_addr.u.Word[i]) return FALSE;
if (addr6->sin6_addr.u.Word[5] != 0xffff) 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_port = addr6->sin6_port;
addr4->sin_addr.S_un.S_addr = addr6->sin6_addr.u.Word[6] << 16 | addr6->sin6_addr.u.Word[7]; 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) ); 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 (!pDataPlanStatus) return E_POINTER;
if (dst && ((dst->sa_family == WS_AF_INET && (dst4 = (SOCKADDR_IN *)dst)) || if (dst && ((dst->sa_family == AF_INET && (dst4 = (SOCKADDR_IN *)dst)) ||
((dst->sa_family == WS_AF_INET6 && map_address_6to4( (const SOCKADDR_IN6 *)dst, &addr4 ) ((dst->sa_family == AF_INET6 && map_address_6to4( (const SOCKADDR_IN6 *)dst, &addr4 )
&& (dst4 = &addr4))))) && (dst4 = &addr4)))))
{ {
if ((ret = GetBestInterface( dst4->sin_addr.S_un.S_addr, &index ))) 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->networks );
list_init( &mgr->connections ); 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 (ret != ERROR_BUFFER_OVERFLOW) return;
if (!(buf = heap_alloc( size ))) 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 ); heap_free( buf );
return; return;