wine-commits October 2021

wine-commits@winehq.org

2 participants
1165 discussions

Huw Davies : iphlpapi: Use wide character string literals.
by Alexandre Julliard 06 Oct '21

06 Oct '21

Module: wine Branch: master Commit: 8f73b8e15f3b42b5ffc1641d4e2c31fae1f2ef9a URL: https://source.winehq.org/git/wine.git/?a=commit;h=8f73b8e15f3b42b5ffc1641d… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Oct 6 10:13:01 2021 +0100 iphlpapi: Use wide character string literals. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/iphlpapi_main.c | 59 +++++++++++++++---------------------------- 1 file changed, 21 insertions(+), 38 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 42cd58fa1a6..d9a85beda5f 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -45,7 +45,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(iphlpapi); #define CHARS_IN_GUID 39 -static const WCHAR device_tcpip[] = {'\\','D','E','V','I','C','E','\\','T','C','P','I','P','_',0}; +static const WCHAR *device_tcpip = L"\\DEVICE\\TCPIP_"; DWORD WINAPI AllocateAndGetIpAddrTableFromStack( MIB_IPADDRTABLE **table, BOOL sort, HANDLE heap, DWORD flags ); @@ -67,12 +67,8 @@ DWORD WINAPI ConvertGuidToStringA( const GUID *guid, char *str, DWORD len ) DWORD WINAPI ConvertGuidToStringW( const GUID *guid, WCHAR *str, DWORD len ) { - static const WCHAR fmt[] = { '{','%','0','8','X','-','%','0','4','X','-','%','0','4','X','-', - '%','0','2','X','%','0','2','X','-','%','0','2','X','%','0','2','X', - '%','0','2','X','%','0','2','X','%','0','2','X','%','0','2','X','}',0 }; - if (len < CHARS_IN_GUID) return ERROR_INSUFFICIENT_BUFFER; - swprintf( str, len, fmt, + swprintf( str, len, L"{%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}", guid->Data1, guid->Data2, guid->Data3, guid->Data4[0], guid->Data4[1], guid->Data4[2], guid->Data4[3], guid->Data4[4], guid->Data4[5], guid->Data4[6], guid->Data4[7] ); return ERROR_SUCCESS; @@ -1536,8 +1532,8 @@ DWORD WINAPI GetIcmpStatisticsEx( MIB_ICMP_EX *stats, DWORD family ) static void if_row_fill( MIB_IFROW *row, struct nsi_ndis_ifinfo_rw *rw, struct nsi_ndis_ifinfo_dynamic *dyn, struct nsi_ndis_ifinfo_static *stat ) { - memcpy( row->wszName, device_tcpip, sizeof(device_tcpip) ); - ConvertGuidToStringW( &stat->if_guid, row->wszName + ARRAY_SIZE(device_tcpip) - 1, CHARS_IN_GUID ); + wcscpy( row->wszName, device_tcpip ); + ConvertGuidToStringW( &stat->if_guid, row->wszName + wcslen( device_tcpip ), CHARS_IN_GUID ); row->dwIndex = stat->if_index; row->dwType = stat->type; row->dwMtu = dyn->mtu; @@ -1917,8 +1913,8 @@ DWORD WINAPI GetInterfaceInfo( IP_INTERFACE_INFO *table, ULONG *size ) if (stat[i].type == IF_TYPE_SOFTWARE_LOOPBACK) continue; row = table->Adapter + num++; row->Index = stat[i].if_index; - memcpy( row->Name, device_tcpip, sizeof(device_tcpip) ); - ConvertGuidToStringW( &stat[i].if_guid, row->Name + ARRAY_SIZE(device_tcpip) - 1, CHARS_IN_GUID ); + wcscpy( row->Name, device_tcpip ); + ConvertGuidToStringW( &stat[i].if_guid, row->Name + wcslen( device_tcpip ), CHARS_IN_GUID ); } done: NsiFreeTable( keys, NULL, NULL, stat ); @@ -4244,16 +4240,6 @@ DWORD WINAPI ConvertInterfaceLuidToNameA(const NET_LUID *luid, char *name, SIZE_ return err; } -static const WCHAR otherW[] = {'o','t','h','e','r',0}; -static const WCHAR ethernetW[] = {'e','t','h','e','r','n','e','t',0}; -static const WCHAR tokenringW[] = {'t','o','k','e','n','r','i','n','g',0}; -static const WCHAR pppW[] = {'p','p','p',0}; -static const WCHAR loopbackW[] = {'l','o','o','p','b','a','c','k',0}; -static const WCHAR atmW[] = {'a','t','m',0}; -static const WCHAR wirelessW[] = {'w','i','r','e','l','e','s','s',0}; -static const WCHAR tunnelW[] = {'t','u','n','n','e','l',0}; -static const WCHAR ieee1394W[] = {'i','e','e','e','1','3','9','4',0}; - struct name_prefix { const WCHAR *prefix; @@ -4261,15 +4247,15 @@ struct name_prefix }; static const struct name_prefix name_prefixes[] = { - { otherW, IF_TYPE_OTHER }, - { ethernetW, IF_TYPE_ETHERNET_CSMACD }, - { tokenringW, IF_TYPE_ISO88025_TOKENRING }, - { pppW, IF_TYPE_PPP }, - { loopbackW, IF_TYPE_SOFTWARE_LOOPBACK }, - { atmW, IF_TYPE_ATM }, - { wirelessW, IF_TYPE_IEEE80211 }, - { tunnelW, IF_TYPE_TUNNEL }, - { ieee1394W, IF_TYPE_IEEE1394 } + { L"other", IF_TYPE_OTHER }, + { L"ethernet", IF_TYPE_ETHERNET_CSMACD }, + { L"tokenring", IF_TYPE_ISO88025_TOKENRING }, + { L"ppp", IF_TYPE_PPP }, + { L"loopback", IF_TYPE_SOFTWARE_LOOPBACK }, + { L"atm", IF_TYPE_ATM }, + { L"wireless", IF_TYPE_IEEE80211 }, + { L"tunnel", IF_TYPE_TUNNEL }, + { L"ieee1394", IF_TYPE_IEEE1394 } }; /****************************************************************** @@ -4280,8 +4266,6 @@ DWORD WINAPI ConvertInterfaceLuidToNameW(const NET_LUID *luid, WCHAR *name, SIZE DWORD i, needed; const WCHAR *prefix = NULL; WCHAR buf[IF_MAX_STRING_SIZE + 1]; - static const WCHAR prefix_fmt[] = {'%','s','_','%','d',0}; - static const WCHAR unk_fmt[] = {'i','f','t','y','p','e','%','d','_','%','d',0}; TRACE( "(%p %p %u)\n", luid, name, (DWORD)len ); @@ -4296,8 +4280,8 @@ DWORD WINAPI ConvertInterfaceLuidToNameW(const NET_LUID *luid, WCHAR *name, SIZE } } - if (prefix) needed = swprintf( buf, len, prefix_fmt, prefix, luid->Info.NetLuidIndex ); - else needed = swprintf( buf, len, unk_fmt, luid->Info.IfType, luid->Info.NetLuidIndex ); + if (prefix) needed = swprintf( buf, len, L"%s_%d", prefix, luid->Info.NetLuidIndex ); + else needed = swprintf( buf, len, L"iftype%d_%d", luid->Info.IfType, luid->Info.NetLuidIndex ); if (needed >= len) return ERROR_NOT_ENOUGH_MEMORY; memcpy( name, buf, (needed + 1) * sizeof(WCHAR) ); @@ -4326,8 +4310,8 @@ DWORD WINAPI ConvertInterfaceNameToLuidA(const char *name, NET_LUID *luid) DWORD WINAPI ConvertInterfaceNameToLuidW(const WCHAR *name, NET_LUID *luid) { const WCHAR *sep; - static const WCHAR iftype[] = {'i','f','t','y','p','e',0}; DWORD type = ~0u, i; + int iftype_len = wcslen( L"iftype" ); WCHAR buf[IF_MAX_STRING_SIZE + 1]; TRACE( "(%s %p)\n", debugstr_w(name), luid ); @@ -4339,9 +4323,9 @@ DWORD WINAPI ConvertInterfaceNameToLuidW(const WCHAR *name, NET_LUID *luid) memcpy( buf, name, (sep - name) * sizeof(WCHAR) ); buf[sep - name] = '\0'; - if (sep - name > ARRAY_SIZE(iftype) - 1 && !memcmp( buf, iftype, (ARRAY_SIZE(iftype) - 1) * sizeof(WCHAR) )) + if (sep - name > iftype_len && !memcmp( buf, L"iftype", iftype_len * sizeof(WCHAR) )) { - type = wcstol( buf + ARRAY_SIZE(iftype) - 1, NULL, 10 ); + type = wcstol( buf + iftype_len, NULL, 10 ); } else { @@ -4564,7 +4548,6 @@ BOOL WINAPI IcmpCloseHandle( HANDLE handle ) HANDLE WINAPI IcmpCreateFile( void ) { struct icmp_handle_data *data = heap_alloc( sizeof(*data) ); - static const WCHAR device_name[] = {'\\','\\','.','\\','N','s','i',0}; if (!data) { @@ -4572,7 +4555,7 @@ HANDLE WINAPI IcmpCreateFile( void ) return INVALID_HANDLE_VALUE; } - data->nsi_device = CreateFileW( device_name, 0, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, + data->nsi_device = CreateFileW( L"\\\\.\\Nsi", 0, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, FILE_FLAG_OVERLAPPED, NULL ); if (data->nsi_device == INVALID_HANDLE_VALUE) {

1 0

Huw Davies : iphlpapi: Build with nameless structs and unions.
by Alexandre Julliard 06 Oct '21

06 Oct '21

Module: wine Branch: master Commit: 3aa7c462293ff64e9bdd1c8192eab4f554cd9dbf URL: https://source.winehq.org/git/wine.git/?a=commit;h=3aa7c462293ff64e9bdd1c81… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Oct 6 10:13:00 2021 +0100 iphlpapi: Build with nameless structs and unions. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/iphlpapi_main.c | 78 +++++++++++++++++++++---------------------- 1 file changed, 38 insertions(+), 40 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3aa7c462293ff64e9bdd…

1 0

Huw Davies : iphlpapi: Build with msvcrt.
by Alexandre Julliard 06 Oct '21

06 Oct '21

Module: wine Branch: master Commit: 36cd04aed32e0de24e2c216094ec77606f146ddd URL: https://source.winehq.org/git/wine.git/?a=commit;h=36cd04aed32e0de24e2c2160… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Oct 6 10:12:59 2021 +0100 iphlpapi: Build with msvcrt. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/Makefile.in | 2 -- dlls/iphlpapi/iphlpapi_main.c | 35 +++++++++++++++++------------------ 2 files changed, 17 insertions(+), 20 deletions(-) diff --git a/dlls/iphlpapi/Makefile.in b/dlls/iphlpapi/Makefile.in index e413337a420..d01c764c61f 100644 --- a/dlls/iphlpapi/Makefile.in +++ b/dlls/iphlpapi/Makefile.in @@ -2,8 +2,6 @@ MODULE = iphlpapi.dll IMPORTLIB = iphlpapi IMPORTS = advapi32 dnsapi nsi uuid -EXTRADLLFLAGS = -mcygwin - C_SRCS = \ iphlpapi_main.c diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 6cdf7948901..cb27044ae02 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -41,7 +41,6 @@ #include "wine/nsi.h" #include "wine/debug.h" -#include "wine/unicode.h" #include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(iphlpapi); @@ -75,7 +74,7 @@ DWORD WINAPI ConvertGuidToStringW( const GUID *guid, WCHAR *str, DWORD len ) '%','0','2','X','%','0','2','X','%','0','2','X','%','0','2','X','}',0 }; if (len < CHARS_IN_GUID) return ERROR_INSUFFICIENT_BUFFER; - sprintfW( str, fmt, + swprintf( str, len, fmt, guid->Data1, guid->Data2, guid->Data3, guid->Data4[0], guid->Data4[1], guid->Data4[2], guid->Data4[3], guid->Data4[4], guid->Data4[5], guid->Data4[6], guid->Data4[7] ); return ERROR_SUCCESS; @@ -536,8 +535,8 @@ DWORD WINAPI GetAdapterIndex( WCHAR *adapter_name, ULONG *index ) TRACE( "name %s, index %p\n", debugstr_w( adapter_name ), index ); - if (strlenW( adapter_name ) < strlenW( device_tcpip )) return ERROR_INVALID_PARAMETER; - err = ConvertStringToGuidW( adapter_name + strlenW( device_tcpip ), &guid ); + if (wcslen( adapter_name ) < wcslen( device_tcpip )) return ERROR_INVALID_PARAMETER; + err = ConvertStringToGuidW( adapter_name + wcslen( device_tcpip ), &guid ); if (err) return err; err = ConvertInterfaceGuidToLuid( &guid, &luid ); if (err) return err; @@ -834,8 +833,8 @@ static ULONG adapters_addresses_size( IP_ADAPTER_ADDRESSES *info ) for (aa = info; aa; aa = aa->Next) { size += sizeof(*aa) + ((strlen( aa->AdapterName ) + 1 + 1) & ~1); - size += (strlenW( aa->Description ) + 1 + strlenW( aa->DnsSuffix ) + 1) * sizeof(WCHAR); - if (aa->FriendlyName) size += (strlenW(aa->FriendlyName) + 1) * sizeof(WCHAR); + size += (wcslen( aa->Description ) + 1 + wcslen( aa->DnsSuffix ) + 1) * sizeof(WCHAR); + if (aa->FriendlyName) size += (wcslen( aa->FriendlyName ) + 1) * sizeof(WCHAR); size = (size + align) & ~align; address_lists_iterate( aa, address_entry_size, &size ); } @@ -858,17 +857,17 @@ static void adapters_addresses_copy( IP_ADAPTER_ADDRESSES *dst, IP_ADAPTER_ADDRE memcpy( dst->AdapterName, src->AdapterName, len ); ptr += (len + 1) & ~1; dst->Description = (WCHAR *)ptr; - len = (strlenW( src->Description ) + 1) * sizeof(WCHAR); + len = (wcslen( src->Description ) + 1) * sizeof(WCHAR); memcpy( dst->Description, src->Description, len ); ptr += len; dst->DnsSuffix = (WCHAR *)ptr; - len = (strlenW( src->DnsSuffix ) + 1) * sizeof(WCHAR); + len = (wcslen( src->DnsSuffix ) + 1) * sizeof(WCHAR); memcpy( dst->DnsSuffix, src->DnsSuffix, len ); ptr += len; if (src->FriendlyName) { dst->FriendlyName = (WCHAR *)ptr; - len = (strlenW( src->FriendlyName ) + 1) * sizeof(WCHAR); + len = (wcslen( src->FriendlyName ) + 1) * sizeof(WCHAR); memcpy( dst->FriendlyName, src->FriendlyName, len ); ptr += len; } @@ -1198,9 +1197,9 @@ static DWORD dns_info_alloc( IP_ADAPTER_ADDRESSES *aa, ULONG family, ULONG flags (search = heap_alloc( size ))) { if (!DnsQueryConfig( DnsConfigSearchList, 0, name, NULL, search, &size ) && - search->dwStringCount && strlenW( search->pStringArray[0] ) < MAX_DNS_SUFFIX_STRING_LENGTH) + search->dwStringCount && wcslen( search->pStringArray[0] ) < MAX_DNS_SUFFIX_STRING_LENGTH) { - strcpyW( aa->DnsSuffix, search->pStringArray[0] ); + wcscpy( aa->DnsSuffix, search->pStringArray[0] ); } heap_free( search ); } @@ -4097,7 +4096,7 @@ DWORD WINAPI ConvertInterfaceAliasToLuid( const WCHAR *alias, NET_LUID *luid ) if (!alias || !*alias || !luid) return ERROR_INVALID_PARAMETER; luid->Value = 0; - len = strlenW( alias ); + len = wcslen( alias ); err = NsiAllocateAndGetTable( 1, &NPI_MS_NDIS_MODULEID, NSI_NDIS_IFINFO_TABLE, (void **)&keys, sizeof(*keys), (void **)&data, sizeof(*data), NULL, 0, NULL, 0, &count, 0 ); @@ -4299,8 +4298,8 @@ DWORD WINAPI ConvertInterfaceLuidToNameW(const NET_LUID *luid, WCHAR *name, SIZE } } - if (prefix) needed = snprintfW( buf, len, prefix_fmt, prefix, luid->Info.NetLuidIndex ); - else needed = snprintfW( buf, len, unk_fmt, luid->Info.IfType, luid->Info.NetLuidIndex ); + if (prefix) needed = swprintf( buf, len, prefix_fmt, prefix, luid->Info.NetLuidIndex ); + else needed = swprintf( buf, len, unk_fmt, luid->Info.IfType, luid->Info.NetLuidIndex ); if (needed >= len) return ERROR_NOT_ENOUGH_MEMORY; memcpy( name, buf, (needed + 1) * sizeof(WCHAR) ); @@ -4338,19 +4337,19 @@ DWORD WINAPI ConvertInterfaceNameToLuidW(const WCHAR *name, NET_LUID *luid) if (!luid) return ERROR_INVALID_PARAMETER; memset( luid, 0, sizeof(*luid) ); - if (!name || !(sep = strchrW( name, '_' )) || sep >= name + ARRAY_SIZE(buf)) return ERROR_INVALID_NAME; + if (!name || !(sep = wcschr( name, '_' )) || sep >= name + ARRAY_SIZE(buf)) return ERROR_INVALID_NAME; memcpy( buf, name, (sep - name) * sizeof(WCHAR) ); buf[sep - name] = '\0'; if (sep - name > ARRAY_SIZE(iftype) - 1 && !memcmp( buf, iftype, (ARRAY_SIZE(iftype) - 1) * sizeof(WCHAR) )) { - type = atoiW( buf + ARRAY_SIZE(iftype) - 1 ); + type = wcstol( buf + ARRAY_SIZE(iftype) - 1, NULL, 10 ); } else { for (i = 0; i < ARRAY_SIZE(name_prefixes); i++) { - if (!strcmpW( buf, name_prefixes[i].prefix )) + if (!wcscmp( buf, name_prefixes[i].prefix )) { type = name_prefixes[i].type; break; @@ -4359,7 +4358,7 @@ DWORD WINAPI ConvertInterfaceNameToLuidW(const WCHAR *name, NET_LUID *luid) } if (type == ~0u) return ERROR_INVALID_NAME; - luid->Info.NetLuidIndex = atoiW( sep + 1 ); + luid->Info.NetLuidIndex = wcstol( sep + 1, NULL, 10 ); luid->Info.IfType = type; return ERROR_SUCCESS; }

1 0

Huw Davies : iphlpapi: Implement IcmpSendEcho2Ex() using nsiproxy.
by Alexandre Julliard 06 Oct '21

06 Oct '21

Module: wine Branch: master Commit: 7156d2b1e4dd7be5ee6194c60afa6aafec8b2544 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7156d2b1e4dd7be5ee6194c6… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Oct 6 10:12:58 2021 +0100 iphlpapi: Implement IcmpSendEcho2Ex() using nsiproxy. This results in a small change in behaviour reflected by the change to the tests: previously IcmpCreateFile() would fail if neither a SOCK_RAW nor a SOCK_DGRAM socket were available. With this patch, that failure is delayed until IcmpSendEcho2Ex(). There's no evidence that the original behaviour matches Windows; it's likely the tests were written this way to match Wine's implementation. If there does turn out to be an app that depends on the old behaviour, it would be possible to send an ioctl during IcmpCreateFile() to probe for this. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/Makefile.in | 1 - dlls/iphlpapi/icmp.c | 643 ----------------------------------------- dlls/iphlpapi/ip.h | 180 ------------ dlls/iphlpapi/ip_icmp.h | 186 ------------ dlls/iphlpapi/iphlpapi_main.c | 172 +++++++++++ dlls/iphlpapi/tests/iphlpapi.c | 14 +- 6 files changed, 177 insertions(+), 1019 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7156d2b1e4dd7be5ee61…

1 0

Huw Davies : iphlpapi: Move the Icmp6 stubs to iphlpapi_main.c.
by Alexandre Julliard 06 Oct '21

06 Oct '21

Module: wine Branch: master Commit: 9d8abb1ee5eee8d71ec33501e0ff584475a8bddc URL: https://source.winehq.org/git/wine.git/?a=commit;h=9d8abb1ee5eee8d71ec33501… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Oct 6 10:12:57 2021 +0100 iphlpapi: Move the Icmp6 stubs to iphlpapi_main.c. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/icmp.c | 58 ------------------------------------------- dlls/iphlpapi/iphlpapi_main.c | 23 +++++++++++++++++ 2 files changed, 23 insertions(+), 58 deletions(-) diff --git a/dlls/iphlpapi/icmp.c b/dlls/iphlpapi/icmp.c index 8ef03219e52..6441d7dd8ad 100644 --- a/dlls/iphlpapi/icmp.c +++ b/dlls/iphlpapi/icmp.c @@ -353,64 +353,6 @@ done: * Exported Routines. */ -/*********************************************************************** - * Icmp6CreateFile (IPHLPAPI.@) - */ -HANDLE WINAPI Icmp6CreateFile(VOID) -{ - icmp_t* icp; - - int sid=socket(AF_INET6,SOCK_RAW,IPPROTO_ICMPV6); - if (sid < 0) - { - /* Some systems (e.g. Linux 3.0+ and Mac OS X) support - non-privileged ICMP via SOCK_DGRAM type. */ - sid=socket(AF_INET6,SOCK_DGRAM,IPPROTO_ICMPV6); - } - if (sid < 0) { - ERR_(winediag)("Failed to use ICMPV6 (network ping), this requires special permissions.\n"); - SetLastError(ERROR_ACCESS_DENIED); - return INVALID_HANDLE_VALUE; - } - - icp=HeapAlloc(GetProcessHeap(), 0, sizeof(*icp)); - if (icp==NULL) { - close(sid); - SetLastError(IP_NO_RESOURCES); - return INVALID_HANDLE_VALUE; - } - icp->sid=sid; - icp->default_opts.OptionsSize=IP_OPTS_UNKNOWN; - return (HANDLE)icp; -} - - -/*********************************************************************** - * Icmp6SendEcho2 (IPHLPAPI.@) - */ -DWORD WINAPI Icmp6SendEcho2( - HANDLE IcmpHandle, - HANDLE Event, - PIO_APC_ROUTINE ApcRoutine, - PVOID ApcContext, - struct sockaddr_in6* SourceAddress, - struct sockaddr_in6* DestinationAddress, - LPVOID RequestData, - WORD RequestSize, - PIP_OPTION_INFORMATION RequestOptions, - LPVOID ReplyBuffer, - DWORD ReplySize, - DWORD Timeout - ) -{ - FIXME("(%p, %p, %p, %p, %p, %p, %p, %d, %p, %p, %d, %d): stub\n", IcmpHandle, Event, - ApcRoutine, ApcContext, SourceAddress, DestinationAddress, RequestData, - RequestSize, RequestOptions, ReplyBuffer, ReplySize, Timeout); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - - /*********************************************************************** * IcmpCreateFile (IPHLPAPI.@) */ diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 9e525a2116c..2286c732383 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -4555,3 +4555,26 @@ DWORD WINAPI IcmpParseReplies( void *reply, DWORD reply_size ) if (!num_pkts) SetLastError( icmp_reply->Status ); return num_pkts; } + +/*********************************************************************** + * Icmp6CreateFile (IPHLPAPI.@) + */ +HANDLE WINAPI Icmp6CreateFile( void ) +{ + FIXME( "stub\n" ); + SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); + return INVALID_HANDLE_VALUE; +} + +/*********************************************************************** + * Icmp6SendEcho2 (IPHLPAPI.@) + */ +DWORD WINAPI Icmp6SendEcho2( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc_routine, void *apc_ctxt, + struct sockaddr_in6 *src, struct sockaddr_in6 *dst, void *request, WORD request_size, + IP_OPTION_INFORMATION *opts, void *reply, DWORD reply_size, DWORD timeout ) +{ + FIXME( "(%p, %p, %p, %p, %p, %p, %p, %d, %p, %p, %d, %d): stub\n", handle, event, + apc_routine, apc_ctxt, src, dst, request, request_size, opts, reply, reply_size, timeout ); + SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); + return 0; +}

1 0

Huw Davies : iphlpapi: Implement IcmpParseReplies().
by Alexandre Julliard 06 Oct '21

06 Oct '21

Module: wine Branch: master Commit: f6ca752201b191326ce837edeae56792b5c23044 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f6ca752201b191326ce837ed… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Oct 6 10:12:56 2021 +0100 iphlpapi: Implement IcmpParseReplies(). Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/iphlpapi.spec | 2 +- dlls/iphlpapi/iphlpapi_main.c | 14 ++++++++++++ dlls/iphlpapi/tests/iphlpapi.c | 49 ++++++++++++++++++++++++++++++------------ 3 files changed, 50 insertions(+), 15 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi.spec b/dlls/iphlpapi/iphlpapi.spec index 6c51548b6e3..ce188084c01 100644 --- a/dlls/iphlpapi/iphlpapi.spec +++ b/dlls/iphlpapi/iphlpapi.spec @@ -157,7 +157,7 @@ @ stdcall Icmp6SendEcho2(ptr ptr ptr ptr ptr ptr ptr long ptr ptr long long) @ stdcall IcmpCloseHandle(ptr) @ stdcall IcmpCreateFile() -@ stub IcmpParseReplies +@ stdcall IcmpParseReplies(ptr long) @ stdcall IcmpSendEcho2Ex(ptr ptr ptr ptr long long ptr long ptr ptr long long) @ stdcall IcmpSendEcho2(ptr ptr ptr ptr long ptr long ptr ptr long long) @ stdcall IcmpSendEcho(ptr long ptr long ptr ptr long long) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index d52441f022a..9e525a2116c 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -2,6 +2,7 @@ * iphlpapi dll implementation * * Copyright (C) 2003,2006 Juan Lang + * Copyright 2021 Huw Davies * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -4541,3 +4542,16 @@ DWORD WINAPI ParseNetworkString(const WCHAR *str, DWORD type, return ERROR_INVALID_PARAMETER; } + +/****************************************************************** + * IcmpParseReplies (IPHLPAPI.@) + */ +DWORD WINAPI IcmpParseReplies( void *reply, DWORD reply_size ) +{ + ICMP_ECHO_REPLY *icmp_reply = reply; + DWORD num_pkts = icmp_reply->Reserved; + + icmp_reply->Reserved = 0; + if (!num_pkts) SetLastError( icmp_reply->Status ); + return num_pkts; +} diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index 223d6d270cb..080feb364f9 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -1043,20 +1043,40 @@ static void testIcmpSendEcho(void) IcmpCloseHandle(icmp); } -/* -still-to-be-tested NT4-onward functions: -CreateIpForwardEntry -DeleteIpForwardEntry -CreateIpNetEntry -DeleteIpNetEntry -GetFriendlyIfIndex -GetRTTAndHopCount -SetIfEntry -SetIpForwardEntry -SetIpNetEntry -SetIpStatistics -SetIpTTL -*/ +static void testIcmpParseReplies( void ) +{ + ICMP_ECHO_REPLY reply = { 0 }; + DWORD ret; + + SetLastError( 0xdeadbeef ); + ret = IcmpParseReplies( &reply, sizeof(reply) ); + ok( ret == 0, "ret %d\n", ret ); + ok( GetLastError() == 0, "gle %d\n", GetLastError() ); + + reply.Status = 12345; + SetLastError( 0xdeadbeef ); + ret = IcmpParseReplies( &reply, sizeof(reply) ); + ok( ret == 0, "ret %d\n", ret ); + ok( GetLastError() == 12345, "gle %d\n", GetLastError() ); + ok( reply.Status == 12345, "status %d\n", reply.Status ); + + reply.Reserved = 1; + SetLastError( 0xdeadbeef ); + ret = IcmpParseReplies( &reply, sizeof(reply) ); + ok( ret == 1, "ret %d\n", ret ); + ok( GetLastError() == 0xdeadbeef, "gle %d\n", GetLastError() ); + ok( reply.Status == 12345, "status %d\n", reply.Status ); + ok( !reply.Reserved, "reserved %d\n", reply.Reserved ); + + reply.Reserved = 3; + SetLastError( 0xdeadbeef ); + ret = IcmpParseReplies( &reply, sizeof(reply) ); + ok( ret == 3, "ret %d\n", ret ); + ok( GetLastError() == 0xdeadbeef, "gle %d\n", GetLastError() ); + ok( reply.Status == 12345, "status %d\n", reply.Status ); + ok( !reply.Reserved, "reserved %d\n", reply.Reserved ); +} + static void testWinNT4Functions(void) { testGetNumberOfInterfaces(); @@ -1076,6 +1096,7 @@ static void testWinNT4Functions(void) testGetUdpTable(); testSetTcpEntry(); testIcmpSendEcho(); + testIcmpParseReplies(); } static void testGetInterfaceInfo(void)

1 0

Huw Davies : iphlpapi: Stop using USE_WS_PREFIX.
by Alexandre Julliard 06 Oct '21

06 Oct '21

Module: wine Branch: master Commit: da81d63f6f10149d89f34f1306c5c39e09b202d6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=da81d63f6f10149d89f34f13… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Oct 6 10:12:55 2021 +0100 iphlpapi: Stop using USE_WS_PREFIX. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/iphlpapi_main.c | 231 +++++++++++++++++++----------------------- 1 file changed, 105 insertions(+), 126 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=da81d63f6f10149d89f3…

1 0

Alexandre Julliard : makefiles: Use the STATICLIB variable for static import libraries.
by Alexandre Julliard 06 Oct '21

06 Oct '21

Module: wine Branch: master Commit: 518f9a12c18bd951bc71f3128e296841ede3774e URL: https://source.winehq.org/git/wine.git/?a=commit;h=518f9a12c18bd951bc71f312… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 6 10:20:26 2021 +0200 makefiles: Use the STATICLIB variable for static import libraries. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/adsiid/Makefile.in | 2 +- dlls/dmoguids/Makefile.in | 2 +- dlls/dxerr8/Makefile.in | 2 +- dlls/dxerr9/Makefile.in | 2 +- dlls/dxguid/Makefile.in | 2 +- dlls/mfuuid/Makefile.in | 2 +- dlls/strmbase/Makefile.in | 2 +- dlls/strmiids/Makefile.in | 2 +- dlls/uuid/Makefile.in | 2 +- dlls/wbemuuid/Makefile.in | 2 +- dlls/winecrt0/Makefile.in | 2 +- dlls/wmcodecdspuuid/Makefile.in | 2 +- tools/make_makefiles | 16 +++++++--------- tools/makedep.c | 10 +++++----- 14 files changed, 24 insertions(+), 26 deletions(-) diff --git a/dlls/adsiid/Makefile.in b/dlls/adsiid/Makefile.in index d741ea55c7b..14a46b31108 100644 --- a/dlls/adsiid/Makefile.in +++ b/dlls/adsiid/Makefile.in @@ -1,4 +1,4 @@ -MODULE = libadsiid.a +STATICLIB = libadsiid.a C_SRCS = \ adsiid.c diff --git a/dlls/dmoguids/Makefile.in b/dlls/dmoguids/Makefile.in index db38e5756a5..183a4359918 100644 --- a/dlls/dmoguids/Makefile.in +++ b/dlls/dmoguids/Makefile.in @@ -1,4 +1,4 @@ -MODULE = libdmoguids.a +STATICLIB = libdmoguids.a C_SRCS = \ dmoguids.c diff --git a/dlls/dxerr8/Makefile.in b/dlls/dxerr8/Makefile.in index c056b1cd1af..04e9d382723 100644 --- a/dlls/dxerr8/Makefile.in +++ b/dlls/dxerr8/Makefile.in @@ -1,4 +1,4 @@ -MODULE = libdxerr8.a +STATICLIB = libdxerr8.a C_SRCS = \ dxerr8.c diff --git a/dlls/dxerr9/Makefile.in b/dlls/dxerr9/Makefile.in index 04fac1fb3e0..1f3bdaed39f 100644 --- a/dlls/dxerr9/Makefile.in +++ b/dlls/dxerr9/Makefile.in @@ -1,4 +1,4 @@ -MODULE = libdxerr9.a +STATICLIB = libdxerr9.a C_SRCS = \ dxerr9.c diff --git a/dlls/dxguid/Makefile.in b/dlls/dxguid/Makefile.in index 551bff93695..60f50bd2146 100644 --- a/dlls/dxguid/Makefile.in +++ b/dlls/dxguid/Makefile.in @@ -1,4 +1,4 @@ -MODULE = libdxguid.a +STATICLIB = libdxguid.a C_SRCS = \ dx10guid.c \ diff --git a/dlls/mfuuid/Makefile.in b/dlls/mfuuid/Makefile.in index b42583bbb73..a17fead940c 100644 --- a/dlls/mfuuid/Makefile.in +++ b/dlls/mfuuid/Makefile.in @@ -1,4 +1,4 @@ -MODULE = libmfuuid.a +STATICLIB = libmfuuid.a C_SRCS = \ mfplay.c \ diff --git a/dlls/strmbase/Makefile.in b/dlls/strmbase/Makefile.in index 0fef7b6ff03..077abc1da50 100644 --- a/dlls/strmbase/Makefile.in +++ b/dlls/strmbase/Makefile.in @@ -1,4 +1,4 @@ -MODULE = libstrmbase.a +STATICLIB = libstrmbase.a C_SRCS = \ dispatch.c \ diff --git a/dlls/strmiids/Makefile.in b/dlls/strmiids/Makefile.in index 09edc7018fc..1b9bbd98fb6 100644 --- a/dlls/strmiids/Makefile.in +++ b/dlls/strmiids/Makefile.in @@ -1,4 +1,4 @@ -MODULE = libstrmiids.a +STATICLIB = libstrmiids.a C_SRCS = \ evr.c \ diff --git a/dlls/uuid/Makefile.in b/dlls/uuid/Makefile.in index ba163e30ca2..2a27740d7ed 100644 --- a/dlls/uuid/Makefile.in +++ b/dlls/uuid/Makefile.in @@ -1,4 +1,4 @@ -MODULE = libuuid.a +STATICLIB = libuuid.a C_SRCS = \ d2d.c \ diff --git a/dlls/wbemuuid/Makefile.in b/dlls/wbemuuid/Makefile.in index 449a0e68a87..87a07d463e1 100644 --- a/dlls/wbemuuid/Makefile.in +++ b/dlls/wbemuuid/Makefile.in @@ -1,4 +1,4 @@ -MODULE = libwbemuuid.a +STATICLIB = libwbemuuid.a C_SRCS = \ wbemuuid.c diff --git a/dlls/winecrt0/Makefile.in b/dlls/winecrt0/Makefile.in index 45cff11233e..17da4da29c6 100644 --- a/dlls/winecrt0/Makefile.in +++ b/dlls/winecrt0/Makefile.in @@ -1,4 +1,4 @@ -MODULE = libwinecrt0.a +STATICLIB = libwinecrt0.a C_SRCS = \ crt_dllmain.c \ diff --git a/dlls/wmcodecdspuuid/Makefile.in b/dlls/wmcodecdspuuid/Makefile.in index d8f5d024413..04b5a7a378f 100644 --- a/dlls/wmcodecdspuuid/Makefile.in +++ b/dlls/wmcodecdspuuid/Makefile.in @@ -1,4 +1,4 @@ -MODULE = libwmcodecdspuuid.a +STATICLIB = libwmcodecdspuuid.a C_SRCS = \ wmcodecdspuuid.c diff --git a/tools/make_makefiles b/tools/make_makefiles index 3abba2da840..a316b42dd73 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -229,7 +229,7 @@ sub parse_makefile($) { die "Configure substitution is not allowed in $file" unless $file eq "Makefile"; } - if (/^\s*(MODULE|IMPORTLIB|TESTDLL|PARENTSRC|APPMODE|EXTRADLLFLAGS)\s*=\s*(.*)/) + if (/^\s*(MODULE|IMPORTLIB|TESTDLL|STATICLIB|PARENTSRC|EXTRADLLFLAGS)\s*=\s*(.*)/) { my $var = $1; $make{$var} = $2; @@ -433,17 +433,16 @@ sub update_makefiles(@) die "MODULE should not be defined in $file" if defined $make{"MODULE"}; die "STATICLIB should not be defined in $file" if defined $make{"STATICLIB"}; } - elsif (defined($make{"MODULE"}) && $make{"MODULE"} =~ /\.a$/) # import lib + elsif (defined($make{"STATICLIB"})) { - die "MODULE should not be defined as static lib in $file" unless $file =~ /^dlls\//; - die "APPMODE should not be defined in $file" if defined $make{"APPMODE"}; - die "STATICLIB should not be defined in $file" if defined $make{"STATICLIB"}; + die "MODULE should not be defined in $file" if defined $make{"MODULE"}; + die "invalid STATICLIB name" unless $make{"STATICLIB"} =~ /\.a$/; } elsif (defined($make{"MODULE"})) # dll or program { (my $name = $file) =~ s/^(dlls|programs)\/(.*)\/Makefile/$2/; my $dllflags = $make{"EXTRADLLFLAGS"} || ""; - if (defined $make{"APPMODE"}) { $dllflags .= " " . $make{"APPMODE"}; } + die "invalid MODULE name" if $make{"MODULE"} =~ /\.a$/; die "MODULE should not be defined in $file" unless $file =~ /^(dlls|programs)\//; die "STATICLIB should not be defined in $file" if defined $make{"STATICLIB"}; if ($file =~ /^programs\//) @@ -454,7 +453,6 @@ sub update_makefiles(@) } else { - die "APPMODE should not be defined in $file" if defined $make{"APPMODE"} ; die "EXTRADLLFLAGS should not contain -mconsole or -mwindows in $file" if $dllflags =~ /-m(console|windows)/; die "Invalid MODULE in $file" unless ($name =~ /\./ && $make{"MODULE"} eq $name) || $make{"MODULE"} eq "$name.dll"; } @@ -467,9 +465,9 @@ sub update_makefiles(@) } elsif ($file =~ /^tools.*\/Makefile$/) { - die "APPMODE should not be defined in $file" if defined $make{"APPMODE"}; - die "EXTRADLLFLAGS should not be defined in $file" if defined $make{"EXTRADLLFLAGS"}; + die "MODULE should not be defined in $file" if defined $make{"MODULE"}; die "STATICLIB should not be defined in $file" if defined $make{"STATICLIB"}; + die "EXTRADLLFLAGS should not be defined in $file" if defined $make{"EXTRADLLFLAGS"}; $args = ",,[test \"x\$enable_tools\" = xno]"; } push @lines, "WINE_CONFIG_MAKEFILE($dir$args)\n"; diff --git a/tools/makedep.c b/tools/makedep.c index 88b179a9070..bb2201dadb1 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -2965,12 +2965,12 @@ static void output_source_default( struct makefile *make, struct incl_file *sour find_src_file( make, replace_extension( source->name, ".c", ".spec" ))); int need_cross = (crosstarget && !(source->file->flags & FLAG_C_UNIX) && - (make->is_cross || (make->module && make->staticlib) || + (make->is_cross || make->staticlib || (source->file->flags & FLAG_C_IMPLIB))); int need_obj = ((*dll_ext || !(source->file->flags & FLAG_C_UNIX)) && (!need_cross || (source->file->flags & FLAG_C_IMPLIB) || - (make->module && make->staticlib))); + make->staticlib)); if ((source->file->flags & FLAG_GENERATED) && (!make->testdll || !strendswith( source->filename, "testlist.c" ))) @@ -2988,11 +2988,11 @@ static void output_source_default( struct makefile *make, struct incl_file *sour output( "%s.o: %s\n", obj_dir_path( make, obj ), source->filename ); output( "\t%s$(CC) -c -o $@ %s", cmd_prefix( "CC" ), source->filename ); output_filenames( defines ); - if (make->sharedlib || (make->staticlib && !make->module) || (source->file->flags & FLAG_C_UNIX)) + if (make->sharedlib || (source->file->flags & FLAG_C_UNIX)) { output_filenames( unix_dllflags ); } - else if (make->module || make->staticlib || make->testdll) + else if (make->module || make->testdll) { output_filenames( dll_flags ); if (source->use_msvcrt) output_filenames( msvcrt_flags ); @@ -4084,7 +4084,7 @@ static void load_sources( struct makefile *make ) make->install_dev = get_expanded_make_var_array( make, "INSTALL_DEV" ); make->extra_targets = get_expanded_make_var_array( make, "EXTRA_TARGETS" ); - if (make->module && strendswith( make->module, ".a" )) make->staticlib = make->module; + if (make->staticlib) make->module = make->staticlib; make->disabled = make->obj_dir && strarray_exists( &disabled_dirs, make->obj_dir ); make->is_win16 = strarray_exists( &make->extradllflags, "-m16" );

1 0

Alexandre Julliard : makefiles: Remove libwine_port.
by Alexandre Julliard 06 Oct '21

06 Oct '21

Module: wine Branch: master Commit: c60d604544107eea9e4b28e3e60640b2c06a0eec URL: https://source.winehq.org/git/wine.git/?a=commit;h=c60d604544107eea9e4b28e3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 6 10:19:24 2021 +0200 makefiles: Remove libwine_port. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 -- configure.ac | 1 - libs/port/Makefile.in | 1 - tools/makedep.c | 1 - 4 files changed, 5 deletions(-) diff --git a/configure b/configure index f1d9aeb24ef..d9ba80332bd 100755 --- a/configure +++ b/configure @@ -1786,7 +1786,6 @@ enable_xpsprint enable_xpssvcs enable_fonts enable_include -enable_port enable_wine enable_loader enable_nls @@ -21012,7 +21011,6 @@ wine_fn_config_makefile dlls/xpsprint enable_xpsprint wine_fn_config_makefile dlls/xpssvcs enable_xpssvcs wine_fn_config_makefile fonts enable_fonts wine_fn_config_makefile include enable_include -wine_fn_config_makefile libs/port enable_port wine_fn_config_makefile libs/wine enable_wine wine_fn_config_makefile loader enable_loader wine_fn_config_makefile nls enable_nls diff --git a/configure.ac b/configure.ac index 3fff076470e..4497e98e7bb 100644 --- a/configure.ac +++ b/configure.ac @@ -3842,7 +3842,6 @@ WINE_CONFIG_MAKEFILE(dlls/xpsprint) WINE_CONFIG_MAKEFILE(dlls/xpssvcs) WINE_CONFIG_MAKEFILE(fonts) WINE_CONFIG_MAKEFILE(include) -WINE_CONFIG_MAKEFILE(libs/port) WINE_CONFIG_MAKEFILE(libs/wine) WINE_CONFIG_MAKEFILE(loader) WINE_CONFIG_MAKEFILE(nls) diff --git a/libs/port/Makefile.in b/libs/port/Makefile.in deleted file mode 100644 index 670b272cbf1..00000000000 --- a/libs/port/Makefile.in +++ /dev/null @@ -1 +0,0 @@ -STATICLIB = libwine_port.a diff --git a/tools/makedep.c b/tools/makedep.c index 15939edfb78..88b179a9070 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -2024,7 +2024,6 @@ static struct strarray add_unix_libraries( const struct makefile *make, struct s struct strarray all_libs = empty_strarray; unsigned int i, j; - strarray_add( &all_libs, "-lwine_port" ); if (make->native_unix_lib && strcmp( make->unixlib, "ntdll.so" )) strarray_add( &all_libs, "-lntdll" ); strarray_addall( &all_libs, get_expanded_make_var_array( make, "EXTRALIBS" )); strarray_addall( &all_libs, libs );

1 0

Alexandre Julliard : libport: Remove the symlink() implementation.
by Alexandre Julliard 06 Oct '21

06 Oct '21

Module: wine Branch: master Commit: dd895f496ae1ff76f1726d5ce3b0bc0024a47f8a URL: https://source.winehq.org/git/wine.git/?a=commit;h=dd895f496ae1ff76f1726d5c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 6 10:17:54 2021 +0200 libport: Remove the symlink() implementation. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 - configure.ac | 1 - include/config.h.in | 3 --- include/wine/port.h | 11 ++--------- libs/port/Makefile.in | 3 --- libs/port/symlink.c | 38 -------------------------------------- 6 files changed, 2 insertions(+), 55 deletions(-) diff --git a/configure b/configure index 6ca64c1fcfd..f1d9aeb24ef 100755 --- a/configure +++ b/configure @@ -17919,7 +17919,6 @@ for ac_func in \ setproctitle \ setprogname \ sigprocmask \ - symlink \ sysinfo \ tcdrain \ thr_kill2 diff --git a/configure.ac b/configure.ac index d1f23bcc9e9..3fff076470e 100644 --- a/configure.ac +++ b/configure.ac @@ -2150,7 +2150,6 @@ AC_CHECK_FUNCS(\ setproctitle \ setprogname \ sigprocmask \ - symlink \ sysinfo \ tcdrain \ thr_kill2 diff --git a/include/config.h.in b/include/config.h.in index 7d7393c19db..fc3749895a3 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -687,9 +687,6 @@ /* Define to 1 if `_u._ext.nscount6' is a member of `struct __res_state'. */ #undef HAVE_STRUCT___RES_STATE__U__EXT_NSCOUNT6 -/* Define to 1 if you have the `symlink' function. */ -#undef HAVE_SYMLINK - /* Define to 1 if you have the <syscall.h> header file. */ #undef HAVE_SYSCALL_H diff --git a/include/wine/port.h b/include/wine/port.h index be8e5463a14..410fa670757 100644 --- a/include/wine/port.h +++ b/include/wine/port.h @@ -50,6 +50,7 @@ #if defined(_WIN32) && !defined(__CYGWIN__) #include <direct.h> +#include <errno.h> #include <io.h> #include <process.h> @@ -57,6 +58,7 @@ static inline void *dlopen(const char *name, int flags) { return NULL; } static inline void *dlsym(void *handle, const char *name) { return NULL; } static inline int dlclose(void *handle) { return 0; } static inline const char *dlerror(void) { return "No dlopen support on Windows"; } +static inline int symlink(const char *from, const char *to) { errno = ENOSYS; return -1; } #ifdef _MSC_VER /* The UCRT headers in the Windows SDK #error out if we #define snprintf. @@ -94,13 +96,4 @@ static inline const char *dlerror(void) { return "No dlopen support on Windows"; #define M_PI_2 1.570796326794896619 #endif - -/**************************************************************** - * Function definitions (only when using libwine_port) - */ - -#ifndef HAVE_SYMLINK -int symlink(const char *from, const char *to); -#endif - #endif /* !defined(__WINE_WINE_PORT_H) */ diff --git a/libs/port/Makefile.in b/libs/port/Makefile.in index 7daaa9c845d..670b272cbf1 100644 --- a/libs/port/Makefile.in +++ b/libs/port/Makefile.in @@ -1,4 +1 @@ STATICLIB = libwine_port.a - -C_SRCS = \ - symlink.c diff --git a/libs/port/symlink.c b/libs/port/symlink.c deleted file mode 100644 index efb44eca1d9..00000000000 --- a/libs/port/symlink.c +++ /dev/null @@ -1,38 +0,0 @@ -/* - * symlink function - * - * Copyright 2008 Alexandre Julliard - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include "config.h" -#include "wine/port.h" - -#include <errno.h> -#include <stdio.h> -#ifdef HAVE_UNISTD_H -# include <unistd.h> -#endif - -#ifndef HAVE_SYMLINK - -int symlink( const char *from, const char *to ) -{ - errno = ENOSYS; - return -1; -} - -#endif /* HAVE_SYMLINK */

1 0

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 October 2021